nano

commit d7a5bacf15b0e5164afefdb01c85c25e4a02e80a
parent 20facb40c34ebe1ce4ad9627b527c7c629bd00aa
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Sun, 24 Mar 2019 12:47:41 +0100

po: update translations and regenerate POT file and PO files

Diffstat:
M
po/LINGUAS
 | 
2
+-
M
po/bg.po
 | 
1056
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/ca.po
 | 
1096
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/cs.po
 | 
1420
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/da.po
 | 
1088
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/de.po
 | 
1058
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/eo.po
 | 
1066
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/es.po
 | 
1080
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/eu.po
 | 
1057
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/fi.po
 | 
1080
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/fr.po
 | 
1113
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/ga.po
 | 
1076
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/gl.po
 | 
1079
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/hr.po
 | 
1745
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/hu.po
 | 
1082
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/id.po
 | 
1032
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/it.po
 | 
1084
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/ja.po
 | 
1116
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
A
po/ko.po
 | 
2684
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
po/ms.po
 | 
1082
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/nano.pot
 | 
991
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/nb.po
 | 
1084
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/nl.po
 | 
1074
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/nn.po
 | 
1030
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
po/pl.po
 | 
1076
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/pt.po
 | 
1081
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/pt_BR.po
 | 
1112
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/ro.po
 | 
1076
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/ru.po
 | 
1083
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/sl.po
 | 
1087
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/sr.po
 | 
1076
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/sv.po
 | 
1084
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/tr.po
 | 
1089
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/uk.po
 | 
1091
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/vi.po
 | 
1076
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
po/zh_CN.po
 | 
1087
++++++++++++++++++++++++++++++++++++++++++-------------------------------------
M
po/zh_TW.po
 | 
1784
+++++++++++++++++++++++++++++++++++++++++--------------------------------------

37 files changed, 23834 insertions(+), 18243 deletions(-)
diff --git a/po/LINGUAS b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW
+bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ko ms nb nl nn pl pt pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW
diff --git a/po/bg.po b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -29,9 +29,9 @@ msgstr "Не може да се премине в горната директо
 msgid "Go To Directory"
 msgstr "Отиване в директория"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Отменено"
 
@@ -46,9 +46,9 @@ msgstr "Не може да се запише извън %s"
 msgid "Can't move up a directory"
 msgstr "Не може да се премине в горната директория"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
@@ -95,17 +95,17 @@ msgstr "Това е единственото съвпадение"
 msgid "No current search pattern"
 msgstr "Няма въведен низ за търсене"
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Дублирано име на синтаксис %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -198,7 +198,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Нов буфер"
 
@@ -304,846 +304,839 @@ msgstr "Файл за вмъкване [от %s] "
 msgid "File to insert [from %s]"
 msgstr "Файл за вмъкване [от %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Работна директория"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Не може да се премине в горната директория"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не може да се запише извън %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Твърде много резервни копия?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запис на %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Запазен е %lu ред"
 msgstr[1] "Запазени са %lu реда"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS формат]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac формат]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Резервно копие]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Прикрепяне на избрания текст в началото на файл"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Прикрепяне на избрания текст в края на файл"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Запазване на избрания текст във файл"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Име на файла за прикрепяне в началото му"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Име на файла за прикрепяне в края му"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Име на файл за запазване"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 #, fuzzy
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Запазване под РАЗЛИЧНО ИМЕ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Файлът съществува, ПРЕЗАПИСВАНЕ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(повече)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Изход"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "Поставяне"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Отмяна на текущата функция"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Извежда тази помощна информация"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Затваряне на текущия файлов буфер/Изход от nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Запазване на текущия файл на диска"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Вмъкване на друг файл в текущия"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Търсене на низ или регулярен израз"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 #, fuzzy
 msgid "Go to lefthand column"
 msgstr "Отиване на посочен ред и стълб"
 
-#: src/global.c:556
+#: src/global.c:550
 #, fuzzy
 msgid "Go to righthand column"
 msgstr "Отиване на посочен ред и стълб"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Отрязване от буфера за обмен и поставяне в текущия ред"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Вмъкване на символ за табулация при курсора"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Показване на положението на курсора"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Замяна на низ или регулярен израз"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Отиване на посочен ред и стълб"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Маркиране на текст в позицията на курсора"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Отрязване на текущия ред и съхраняване в буфера за обмен"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Отстъп вдясно на текущия ред"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Маха отстъпа на текущия ред"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:577
 #, fuzzy
 msgid "Go back one character"
 msgstr "Отиване един символ назад"
 
-#: src/global.c:584
+#: src/global.c:578
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Отиване един символ напред"
 
-#: src/global.c:585
+#: src/global.c:579
 #, fuzzy
 msgid "Go back one word"
 msgstr "Отиване назад с една дума"
 
-#: src/global.c:586
+#: src/global.c:580
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Отиване напред с една дума"
 
-#: src/global.c:587
+#: src/global.c:581
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:588
+#: src/global.c:582
 #, fuzzy
 msgid "Go to next line"
 msgstr "Отиване на следващия ред"
 
-#: src/global.c:589
+#: src/global.c:583
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Отиване в началото на текущия ред"
 
-#: src/global.c:590
+#: src/global.c:584
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Отиване в края на текущия ред"
 
-#: src/global.c:591
+#: src/global.c:585
 #, fuzzy
 msgid "Go to previous block of text"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:589
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Отиване в началото на текущия абзац"
 
-#: src/global.c:597
+#: src/global.c:591
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Отиване в края на текущия абзац"
 
-#: src/global.c:599
+#: src/global.c:593
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Отиване в началото на файла"
 
-#: src/global.c:600
+#: src/global.c:594
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Отиване в края на файла"
 
-#: src/global.c:602
+#: src/global.c:596
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Отиване при съответната скоба"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Превърта нагоре с един ред без да мести курсора"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Превърта надолу с един ред без да мести курсора"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Превключване на предишния файлов буфер"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Превключване на следващия файлов буфер"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Вмъкване на следващия клавиш дословно"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Вмъкване на символ за табулация при курсора"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Вмъкване на символ за нов ред при курсора"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Изтриване на символа под курсора"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Изтриване на символа вляво от курсора"
 
-#: src/global.c:622
-#, fuzzy
-msgid "Cut backward from cursor to word start"
-msgstr "Отрязване от курсора до края на реда"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr ""
 
-#: src/global.c:624
-#, fuzzy
-msgid "Cut forward from cursor to next word start"
-msgstr "Отрязване от курсора до края на реда"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Отрязване от позицията на курсора до края на файла"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Подравняване на текущия абзац"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Подравняване на целия файл"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Преброяване на думите, редовете и знаците във файла"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Опресняване на текущия екран"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Отстъп вдясно на текущия ред"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr ""
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Зачитане малки/големи букви при търсене (вкл/изкл)"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Обратна посока на търсене"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Използване на регулярни изрази (вкл/изкл)"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Връща предишния низ за търсене/замяна"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Връща следващия низ за търсене/замяна"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Запазване на файла в DOS формат (вкл/изкл)"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Запазване на файла в Mac формат (вкл/изкл)"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Вмъкване в края на файла (вкл/изкл)"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Вмъкване в началото на файла (вкл/изкл)"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Резервно копира съществуващи файлове (вкл/изкл)"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Изпълнение на външна команда"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Без преобразуване от DOS/Mac формат"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Използване на нов буфер (вкл/изкл)"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Отиване във файлов браузър"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Изход от файловия браузър"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:686
+#: src/global.c:680
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Отиване при първия файл от списъка"
 
-#: src/global.c:687
+#: src/global.c:681
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Отиване при последния файл от списъка"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Отиване в директория"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Отиване на предишния ред"
 
-#: src/global.c:693
+#: src/global.c:687
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Отиване на следващия ред"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Помощ"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Отмяна"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "Запазване"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Отваряне"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Подравн."
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Търсене"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Замяна"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Отиване в директория"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Отрязване"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Отрязване"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Правопис"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Поз.курсор"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Отив. ред"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Избор на текст"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Зач. м/г"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Рег.израз"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Без замяна"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Пълно подравн."
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Не е скоба"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Търсене"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "Предишен файл"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "СледвСтр"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Следваща дума"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "End"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Предишен ред"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Следващ ред"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Предишна дума"
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Следваща дума"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Нач. абзац"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Край абзац"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "ПредСтр"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "СледвСтр"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Първи ред"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Посл. ред"
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "Предишен файл"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Следващ файл"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Отрязване"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Отр. до края"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:963
+#: src/global.c:966
 #, fuzzy
 msgid "Verbatim"
 msgstr "Дословен вход"
 
-#: src/global.c:969
+#: src/global.c:974
 #, fuzzy
 msgid "Suspend"
 msgstr "Временно спиране"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Отстъп"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Без отстъп"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "Следващ ред"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Избор на текст"
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "Отив. ред"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Отиване на текст"
@@ -1227,61 +1220,61 @@ msgstr "Следващ ред"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Постоянно показване на позицията на курсора"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Плавно превъртане"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr ""
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Синтактично осветяване"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Автоматичен отстъп"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Отрязване до края"
 
-#: src/global.c:1416
+#: src/global.c:1426
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Временно спиране"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1644,21 +1637,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Грешка при запис на %s: %s"
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Непозволен клавиш в режим на преглед"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Не може да се излезе от %s в ограничен режим"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1667,7 +1660,7 @@ msgstr ""
 "\n"
 "Буферът е записан в %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1676,7 +1669,7 @@ msgstr ""
 "\n"
 "Буферът не е записан в %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1685,7 +1678,7 @@ msgstr ""
 "\n"
 "Буферът не е записан: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1696,306 +1689,318 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опция\t\tДълга опция\t\tЗначение\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "С интелигентен клавиш „Home“"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Резервно копира съществуващи файлове"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Директория за резервните копия"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Удебелен шрифт вместо инверсно видео"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Прави въведените табулации на интервали"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Запазва/чете историята на търсене/замяна"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Пренебрегва конфиг. файлове nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Коригира объркване от цифровия клав.блок"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Без знак за нов ред в края на файловете"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Без преобразуване от DOS/Mac формат"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Използване още един ред за редактиране"
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Вмъкване на символ за табулация при курсора"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <низ>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<низ>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Ограничен режим"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#стълбове>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#стълбове>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Широчината на табулацията - #стълбове"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Бързо изключване на лентата за състояние"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Показва версията и излиза"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Открива прецизно междусловните граници"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "-X <str>"
 msgstr "-Q <низ>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "--wordchars=<str>"
 msgstr "--quotestr=<низ>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "--syntax=<низ>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Посочва синтаксис за оцветяване"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Автоматичен отстъп при нови редове"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Постоянно показва позицията на курсора"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Коригира объркване на „Backspace/Delete“"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 #, fuzzy
 msgid "Show this help text and exit"
 msgstr "Извежда тази помощна информация"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Автоматичен отстъп при нови редове"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Отрязване от курсора до края на реда"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "С използване на мишка"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Работна директория"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Запазва клавишите „XON“(^Q) и „XOFF“(^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#стълбове>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#стълбове>"
 
-#: src/nano.c:877
-#, fuzzy
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Пренася редовете при ширина #стълбове"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <прог>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<прог>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Алтернативен правописен коректор"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "При изход запазва файла без питане"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Режим на преглед (само за четене)"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Без пренасяне на дългите редове"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Без двата последни реда с помощ"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Позволява временно спиране"
 
-#: src/nano.c:899
+#: src/nano.c:905
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Автоматично пренасяне"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, версия %s (компилиран в %s часа на %s)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 " Е-поща: nano@nano-editor.org\tИнтернет адрес: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2004,336 +2009,355 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи се SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да се върнете в nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Поисканият размер „%s“ за максимална дължина на редове е неправилен"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Поисканият размер „%s“ за максимална дължина на редове е неправилен"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Неправилен регулярен израз \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Не"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Всички"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Грешка в %s на ред %lu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Низовете за регулярни изрази трябва да започват и завършват със символа \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Неправилен регулярен израз \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксисът „none“ е запазен"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 #, fuzzy
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксисът „default“ не приема разширения"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 #, fuzzy
 msgid "Missing key name"
 msgstr "Липсва името на синтаксиса"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Командата „%s“ е неизвестна"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "Цветът за фон „%s“ не може да бъде ярък"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, fuzzy, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 #, fuzzy
 msgid "Empty regex string"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изисква съответстващ „end=“"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Синтаксисът „default“ не приема разширения"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Аргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксисът „%s“ няма команди за цветове"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Командата „%s“ не е позволена във вмъкван файл"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизвестна"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Неизвестен флаг „%s“"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не може да се отмени флаг „%s“"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опцията „%s“ изисква аргумент"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "Опцията не е правилен многобайтов низ"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Необходими са символи, които не са празни"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Необходими са два символа с нормална ширина"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не може да бъде намерена домашната директория! Ах!"
 
@@ -2396,246 +2420,256 @@ msgstr "Не е скоба"
 msgid "No matching bracket"
 msgstr "Няма съвпадаща скоба"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Уставено е маркиране"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Отменено е маркирането"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr ""
 
-#: src/text.c:759 src/text.c:939
+#: src/text.c:567 src/text.c:748
 #, fuzzy
-msgid "text delete"
-msgstr "Следващ файл"
+msgid "deletion"
+msgstr "В избрания текст: "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr ""
 
-#: src/text.c:788 src/text.c:967
+#: src/text.c:596 src/text.c:776
 #, fuzzy
-msgid "text replace"
-msgstr " (за замяна)"
+msgid "replacement"
+msgstr "Редактиране на замяна"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr ""
 
-#: src/text.c:819 src/text.c:999
+#: src/text.c:628 src/text.c:808
 #, fuzzy
-msgid "text insert"
-msgstr "Следващ ред"
+msgid "insertion"
+msgstr "Вмъкване на файл"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Автоматичен отстъп"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Автоматичен отстъп"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr ""
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr ""
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Неуспех при създаването на pipe"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Неуспех при fork"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Неправилен низ за цитиране %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Подравняване на целия файл"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Сега може да се отмени подравняването!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Подравняване на текущия абзац"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Редактиране на замяна"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "Следваща дума"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на списък със сгрешени думи, изчакайте..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Не може да се определи размера на буфера на pipe"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Грешка при извикване на „spell“"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при извикване на „sort -f“"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Неуспех при проверката на правописа: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Неуспех при проверката на правописа: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Проверката на правописа завърши"
 
-#: src/text.c:3037
+#: src/text.c:2801
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Без знак за нов ред в края на файловете"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 #, fuzzy
 msgid "At first message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3329
+#: src/text.c:3093
 #, fuzzy
 msgid "At last message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "В избрания текст: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Дословен вход"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Няма съвпадаща скоба"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano е в недостиг на памет!"
@@ -2662,76 +2696,81 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, fuzzy, c-format
 msgid "Unicode Input: %s"
 msgstr "Вход уникод"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Променен"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Ограничен режим"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), стълб %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Текстов редактор nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Специални благодарности на:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Фондация „Свободен софтуер“"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "и всички останали, които сме забравили..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Благодарим, че използвате nano!"
 
@@ -2763,18 +2802,27 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Move to the next screen"
 #~ msgstr "Отиване на следващия екран"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Отрязване от буфера за обмен и поставяне в текущия ред"
+
 #~ msgid "Repeat last search"
 #~ msgstr "Повтаряне на последното търсене"
 
+#~ msgid "UnJustify"
+#~ msgstr "Изкл.подр."
+
+#~ msgid "UnCut Text"
+#~ msgstr "Поставяне"
+
 #~ msgid "Find Other Bracket"
 #~ msgstr "Намиране на другата скоба"
 
-#~ msgid "Insert File"
-#~ msgstr "Вмъкване на файл"
-
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Използване на още един ред за редактиране"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Плавно превъртане"
+
 #~ msgid "Backup files"
 #~ msgstr "Запазване на резервни копия"
 
@@ -2802,6 +2850,9 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Enable multiple file buffers"
 #~ msgstr "Позволява много файлови буфери"
 
+#~ msgid "Use one more line for editing"
+#~ msgstr "Използване още един ред за редактиране"
+
 #~ msgid "Quoting string"
 #~ msgstr "Низ за цитиране"
 
@@ -2811,6 +2862,9 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Don't follow symbolic links, overwrite"
 #~ msgstr "Не следва символните връзки, замества ги"
 
+#~ msgid "Set wrapping point at column #cols"
+#~ msgstr "Пренася редовете при ширина #стълбове"
+
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(не се използват,за съвместимост с Pico)"
 
@@ -2855,6 +2909,12 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Could not pipe"
 #~ msgstr "Неуспех при pipe"
 
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Неправилен низ за цитиране %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Сега може да се отмени подравняването!"
+
 #~ msgid "File:"
 #~ msgstr "Файл:"
 
diff --git a/po/ca.po b/po/ca.po
@@ -1,15 +1,15 @@
 # Catalan messages for the GNU nano editor.
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015, 2016, 2017, 2018, 2019 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, 2014, 2015, 2016, 2017, 2018.
+# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015, 2016, 2017, 2018, 2019.
 # Miquel Vidal <miquel@sindominio.net>, 2001.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-05 21:27+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-13 11:01+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -29,9 +29,9 @@ msgstr "No es pot obrir el directori: %s"
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
@@ -46,9 +46,9 @@ msgstr "No es pot anar fora de %s"
 msgid "Can't move up a directory"
 msgstr "No es pot ascendir de directori"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "S'ha produït un error en llegir %s: %s"
@@ -94,17 +94,17 @@ msgstr "Aquesta és la única coincidència"
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "El nom de la sintaxi és desconegut: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() ha fallat: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) ha fallat: %s"
@@ -202,7 +202,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu línia (%s)"
 msgstr[1] "%s -- %zu línies (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nou búfer"
 
@@ -306,792 +306,791 @@ msgstr "Fitxer a inserir sense convertir [des de %s]"
 msgid "File to insert [from %s]"
 msgstr "Fitxer a inserir [des de %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "El directori d'operació no és vàlid\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "El directori d'operació no és vàlid: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
-msgstr "El directori de còpies de seguretat no és vàlid\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "El directori de còpies de seguretat no és vàlid: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No es pot escriure fora de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, 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:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Massa fitxers de còpia de seguretat?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "S'ha escrit %zu línia"
 msgstr[1] "S'han escrit %zu línies"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Còpia de seguretat]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Avantposa sel·lecció a un fitxer"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Afegeix la sel·lecció a un fitxer"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Escriu la sel·lecció a un fitxer"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nom del fitxer en el qual avantposar"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nom del fitxer en el qual afegir"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nom del fitxer a escriure"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Massa petita"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "El fitxer existeix -- no es pot sobreescriure"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "El fitxer «%s» existeix; el voleu SOBREESCRIURE? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "El fitxer ha canviat al disc"
 
-#: src/files.c:2291
+#: src/files.c:2285
 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:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(més)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Surt"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Tanca"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Enganxa"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Desjustifica"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Tanca el búfer actual / Surt del nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Escriu el búfer actual (o regió marcada) al disc"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Insereix un altre fitxer dins del búfer actual (o a un búfer nou)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Cerca cap endavant una cadena o expressió regular"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Cerca cap enrere una cadena o expressió regular"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Cerca una cadena cap endavant"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Cerca una cadena cap enrere"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Refresca la llista de fitxers"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Vés a la columna de l'esquerra"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Vés a la columna de la dreta"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Vés a la primera fila d'aquesta columna"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Vés a la darrera fila d'aquesta columna"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Vés a la pantalla anterior"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Vés a la pantalla següent"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Retalla la línia actual (o regió marcada) i desa-la al búfer de retalls"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Enganxa el búfer de retalls a la línia actual"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Enganxa el contingut del búfer a la posició actual del cursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Mostra la posició del cursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Invoca el corrector ortogràfic, si està disponible"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Reemplaça una cadena o una expressió regular"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Vés a un número de línia i columna"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marca text començant des de la posició del cursor"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Copia la línia actual (o regió marcada) i emmagatzema-la al búfer de retalls"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Descarta la línia actual o (regió marcada)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Sagna la línia actual o (línies marcades)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Treu el sagnat de la línia actual (o línies marcades)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Desfés l'última operació"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Refés l'última operació"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Vés enrere un caràcter"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Vés endavant un caràcter"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Vés enrere una paraula"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Vés endavant una paraula"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Vés a la línia anterior"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Vés a la línia següent"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Vés al principi de la línia actual"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Vés al final de la línia actual"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Vés al bloc de text anterior"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Vés al bloc de text següent"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Vés a la primera línia del fitxer"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Vés a l'última línia del fitxer"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Vés a la clau corresponent"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Desplaça amunt una línia sense moure el cursor pel text"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Desplaça avall una línia sense moure el cursor pel text"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Canvia a l'anterior búfer de fitxer"
 
-#: src/global.c:612
+#: src/global.c:606
 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:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereix la següent premuda de tecla textualment"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Insereix una línia nova a la posició del cursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Suprimeix el caràcter sota el cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimeix el caràcter a l'esquerra del cursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Retalla cap enrere des del cursor al principi de la paraula"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Suprimeux cap a enrere des del cursor al principi de la paraula"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Retalla cap avant des del cursor al principi de la següent paraula"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
+"Suprimeix cap a endavant des del cursor al principi de la següent paraula"
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justifica el paràgraf actual"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justifica el fitxer sencer"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Compta el nombre de paraules, línies i caràcters"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixa la pantalla actual"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspèn l'editor (si la suspensió és habilitada)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Prova de completar la paraula actual"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Comenta/descomenta la línia actual (o línies marcades)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Desa el fitxer sense preguntar"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Cerca la següent coincidència cap enrere"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Cerca la següent coincidència cap a avant"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Comença/deixa d'enregistrar una macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Executa la darrera macro enregistrada"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Commuta la sensibilitat a majúscules de la cerca"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inverteix la direcció de la cerca"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Commuta l'ús d'expressions regulars"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça anterior"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça següent"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Commuta l'ús del format DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Commuta l'ús del format Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Commuta l'afegiment"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Commuta l'avantposat"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Commuta la creació d'una còpia de seguretat del fitxer original"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Executa una ordre externa"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Canalitza el búfer actual (o regió marcada) a l'ordre"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "No converteixes des del format DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Commuta l'ús d'un búfer nou"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Tanca el búfer sense desar-lo"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Vés al navegador de fitxers"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Surt del navegador de fitxers"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Vés a l'últim fitxer de la llista"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Vés al fitxer previ de la llista"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Vés al fitxer següent de la llista"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Vés al directori"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Invoca l'analitzador sintàctic, si està disponible"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Vés al missatge anterior de l'analitzador"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Vés al missatge següent de l'analitzador"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ajuda"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Desa"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Llegeix"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justifica"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "On és"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Reemplaça"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Vés a directori"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Retalla"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Enganxa text"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Vés a línia"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refés"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Maj/Min"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Expreg"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Cap Enrere"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "No reemplaces"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Més vell"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Més recent"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "JustCompl"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Vés a la clau"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Desa"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "On era"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Següent"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Endavant"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Paraula següent"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Ant Línia"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Seg Línia"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloc anterior"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloc següent"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Princ de par"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Final de par"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pàg Ant"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Pàg Seg"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Primera línia"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Última línia"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Fitxer anterior"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fitxer següent"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Suprimeix"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Retalla cap a l'esquerra"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Retalla l'esquerra"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Retalla cap a la dreta"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Retalla la dreta"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Textual"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspèn"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Sagna"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Treu el sagnat"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Línies de comentari"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completa"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Enregistra"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Executa una macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Descarta text"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Analitzador"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Desa"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Vés al text"
@@ -1171,59 +1170,59 @@ msgstr "Miss lint seg"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Desplaçament suau"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Desplaçament a salts (cada mitja pantalla)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajusta suaument les línies llargues"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajusta completament les línies llargues"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numeració de línies"
 
@@ -1599,19 +1598,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "S'ha produït un error en escriure %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "La tecla és invàlida al mode visualització"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Aquesta funció està inhabilitada en mode restringit"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "L'ajuda no és disponible"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1620,7 +1619,7 @@ msgstr ""
 "\n"
 "S'ha escrit el búfer en %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1629,7 +1628,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer a %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1638,7 +1637,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1649,7 +1648,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1661,7 +1660,7 @@ msgstr ""
 "pot\n"
 "afegir després d'una coma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1670,281 +1669,293 @@ msgstr ""
 "Quan el nom del fitxer és «-», nano llegeix dades des de l'entrada "
 "estàndard.\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opció\t\tOpció llarga GNU\tSignificat\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Habilita la tecla «inici» intel·ligent"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Fes còpies de seguretat dels fitxers existents"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Directori on desar els fitxers de còpia de seguretat únics"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Utilitza negreta en comptes de text amb els colors invertits"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Converteix les tabulacions introduïdes a espais"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Llegeix un fitxer en un búfer nou per defecte"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Empra fitxers de blocatge (a l'estil del Vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Registra i llegeix la història de cerca/reemplaça"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "No faces servir els fitxers nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Mostra una barra com a guia en aquesta columna"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Arregla el problema de confusió del teclat numèric"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "No afegeixes retorns de carro al final dels fitxers"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "No afegeixis una línia nova automàticament [per defecte]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Suprimeix els espais finals quan s'ajuste el text"
 
-#: src/nano.c:815
-msgid "Don't convert files from DOS/Mac format"
-msgstr "No converteixes des del format DOS/Mac"
-
 #: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Utilitza una línia més per a editar"
+msgid "Don't convert files from DOS/Mac format"
+msgstr "No converteixis des del format DOS/Mac"
 
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Emmagatzema i llegeix la posició del cursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Expressió regular per emparellar entrecomillat"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mode restringit"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Desplaça't per línies en lloc de mitges pantalles"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Estableix l'amplada de tab a #cols columnes"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Neteja la barra d'estat ràpidament"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Imprimeix informació sobre la versió i surt"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detecta els límits entre paraules amb més detall"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <cad>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<cad>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Quins altres caràcters són parts de paraula"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nom>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nom>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definició de sintaxi a utilitzar per a colorejar"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Fes que Supr i Retr suprimeixen una regió marcada"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Quan ajustes suaument, fes-ho als espais en blanc"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ajusta automàticament les línies llargues"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Mostra contínuament la posició del cursor"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arregla el problema de confusió entre Esborra/Suprimeix"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Mantín buida la línia a sota de la barra del títol"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Assegura que el text acaba amb una línia nova"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Mostra el cursor al navegador de fitxers i text d'ajuda"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Mostra aquest text d'ajuda i surt"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Sagna automàticament noves línies"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Desplaça per mitges pantalles, no per línia"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Retalla des del cursor al final de línia"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Mostra el número de línia davant del text"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Habilita l'ús del ratolí"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "No llegeixes el fitxer (només escriu sobre ell)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Estableix directori d'operació"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva les tecles XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Estableix el punt d'ajustament a la columna #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Estableix l'amplada per a l'ajustament i justificat"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Habilita un corrector alternatiu"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Desa automàticament en sortir, no preguntes"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Desa un fitxer per defecte en format Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Mode de visualització (només lectura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "No ajustes les línies llargues"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "No ajustes les línies llargues [per defecte]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "No mostres les dues línies d'ajuda"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Fes que Ctrl+Dreta s'ature al final de les paraules"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Habilita la suspensió"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Habilita l'ajustament suau de línies"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versió %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " © 2014-%s els contribuïdors al nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Correu-e: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1953,276 +1964,295 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Cap nom de fitxer"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Voleu desar el búfer modificat? (Respondre «No» DESCARTARÀ els canvis.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 "S'està llegint des de l'entrada estàndard; premeu ^D o ^D^D per acabar.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "No s'ha pogut obrir l'entrada estàndard: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Ho sentim! Nano ha fallat! Code: %d. Si us plau, informeu de l'error.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empreu «fg» per a tornar al nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "La suspensió no està habilitada"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tecla no assignada"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tecla no assignable: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tecla no assignada: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Tecla no assignable: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tecla no assignada: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tecla no assignada: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "La columna guia «%s» és invàlida"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "S'ignora l'opció %s; és per defecte\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "L'expreg d'entrecomillat «%s» és invàlida: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "El número de línia o columna és invàlid"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Errades en «%s»"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Benvingut al nano. Per obtenir ajuda bàsica, premeu Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "No"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Totes"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Error en %s en la línia %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Les cadenes d'expressió regular han de començar i acabar amb un caràcter \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Manca el nom de la sintaxi"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Cometa desparellada al nom de la sintaxi"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxi «none» és reservada"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Manca el nom de la clau"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "El nom de la tecla és massa curt"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 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:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "El nom de tecla «%s» és invàlid"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Heu d'especificar una funció a la qual assignar la tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "No es pot assignar el nom «%s» a una funció"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "No es pot assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La funció «%s» no existeix al menú «%s»"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr "La combinació «%s» no es pot reassignar"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "S'ha produït un error en expandir %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "No s'entèn el color «%s»"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Un color de fons no pot ser brillant"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Una ordre «%s» requereix una ordre «syntax» precedent"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Manca la cadena d'expreg després de l'ordre «%s»"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Cadena d'expreg buida"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "La sintaxi «default» no admet expressions regulars «%s»"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Manca l'argument després de «%s»"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "L'argument de «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "No hi ha cap tecla assignada a la funció «%s» al menú «%s». S'està sortint.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2230,58 +2260,58 @@ msgstr ""
 "Si és necessari, empreu el nano amb l'opció -I  per a ajustar les vostres "
 "preferències.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "No s'ha trobat la sintaxi «%s» a estendre"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, 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:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Manca l'opció"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "L'opció «%s» és desconeguda"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "No es pot desestablir l'opció «%s»"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "L'argument no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "No s'ha pogut trobar el directori d'usuari! Ai!"
 
@@ -2343,237 +2373,245 @@ msgstr "No és una clau"
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marca establida"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marca esborrada"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Afegir comentaris no està suportat per a aquest tipus de fitxer"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "No es pot comentar més enllà del final del fitxer"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "No hi ha res al búfer de desfer."
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "afegiment de text"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "addició"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "trencat de línia"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "supressió de text"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "supressió"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "unió de línia"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "reemplaçament de text"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "reemplaçament"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
-msgstr "supressió"
+msgstr "esborrat"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "tall de text"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "tall"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "enganxada de text"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "enganxament"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "inserció de text"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "inserció"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
-msgstr "sagna"
+msgstr "sagnat"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "treu el sagnat"
+msgstr "dessagnat"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "comenta"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "descomenta"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "S'ha desfet l'acció (%s)"
+msgid "Undid %s"
+msgstr "S'ha desfet l'acció %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "No hi ha res a refer."
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "S'ha refet l'acció (%s)"
+msgid "Redid %s"
+msgstr "S'ha refet l'acció %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtratge"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "No s'ha pogut obrir la canonada: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "El marcador de cita %s és erroni: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "justificació"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Ara podeu desjustificar!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "S'ha justificat la selecció"
 
-#: src/text.c:2606
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "S'ha justificat el fitxer"
+
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "S'ha justificat el paràgraf"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Paraula no trobada: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Edita un reemplaçament"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Paraula següent…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 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:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "S'ha produït un error en iniciar «spell»"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "S'ha produït un error en iniciar «sort -f»"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:3037
+#: src/text.c:2801
 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:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Voleu desar el búfer abans d'analitzar-ho?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "S'esta invocant l'analitzador, espereu"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, 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:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "No hi ha missatges per a aquest fitxer"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Al primer missatge"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "A l'últim missatge"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sParaules: %zu  Línies: %zd  Caràcters: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrada textual"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "No hi ha cap fragment de paraula"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "No hi ha més coincidències"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "No hi ha coincidències"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "El Nano s'ha quedat sense memòria!\n"
 
@@ -2599,79 +2637,128 @@ msgstr "Massa errors des de l'entrada estàndard\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Seqüència desconeguda"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrada d'Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "S'està analitzant —"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Visualitza"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Restringit"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "S'han suprimit els avisos següents"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "línia %zd/%zd (%d%%), col %zu/%zu (%d%%), car %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "els molts traductors i el TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Enganxa"
+
+#~ msgid "Unjustify"
+#~ msgstr "Desjustifica"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Enganxa el búfer de retalls a la línia actual"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Desplaçament suau"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "No afegeixes retorns de carro al final dels fitxers"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Utilitza una línia més per a editar"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Estableix el punt d'ajustament a la columna #cols"
+
+#~ msgid "text add"
+#~ msgstr "afegiment de text"
+
+#~ msgid "text delete"
+#~ msgstr "supressió de text"
+
+#~ msgid "text replace"
+#~ msgstr "reemplaçament de text"
+
+#~ msgid "text cut"
+#~ msgstr "tall de text"
+
+#~ msgid "text uncut"
+#~ msgstr "enganxada de text"
+
+#~ msgid "text insert"
+#~ msgstr "inserció de text"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "El marcador de cita %s és erroni: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Ara podeu desjustificar!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tecla il·legal en mode no-multibuffer"
 
@@ -3013,9 +3100,6 @@ msgstr "Gràcies per fer servir nano!"
 #~ msgid "Word Count in Selection"
 #~ msgstr "Compte de paraules a la selecció"
 
-#~ msgid "Direction"
-#~ msgstr "Direcció"
-
 #~ msgid ""
 #~ "\n"
 #~ "Buffer not written to %s (too many backup files?)\n"
diff --git a/po/cs.po b/po/cs.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the nano package.
 #
 # Václav Haisman <V.Haisman@sh.cvut.cz>, 2000, 2001.
-# Pavel Fric <pavelfric@seznam.cz>, 2010, 2012, 2013, 2014, 2015, 2016.
+# Pavel Fric <pavelfric@seznam.cz>, 2010, 2012, 2013, 2014, 2015, 2016, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.7.2-pre1\n"
+"Project-Id-Version: nano 3.2-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2016-12-25 21:38+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-01-08 14:32+0100\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: src/browser.c:67
 #, c-format
@@ -30,9 +30,9 @@ msgstr "Nelze otevřít adresář: %s"
 msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Zrušeno"
 
@@ -47,9 +47,9 @@ msgstr "Nelze jít vně %s"
 msgid "Can't move up a directory"
 msgstr "Nepodařilo se přejít do nadřazeného adresáře"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Chyba při čtení: %s: %s"
@@ -95,17 +95,17 @@ msgstr "Toto je jediný výskyt"
 msgid "No current search pattern"
 msgstr "Žádný současný vzor hledání"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Neznámý název skladby: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() selhal: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) selhal: %s"
@@ -172,9 +172,9 @@ msgid "File %s is being edited (by %s with %s, PID %s); continue?"
 msgstr "Soubor %s je upravován (%s s %s, ID procesu %s); pokračovat?"
 
 #: src/files.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "Can't read file from outside of %s"
-msgstr "Nelze vložit soubor z vně %s"
+msgstr "Nelze číst soubor z vně %s"
 
 #: src/files.c:445 src/files.c:1002 src/rcfile.c:510
 #, c-format
@@ -187,38 +187,37 @@ msgid "\"%s\" is not a normal file"
 msgstr "\"%s\" není normální soubor"
 
 #: src/files.c:526 src/files.c:548 src/files.c:572 src/files.c:590
-#, fuzzy
 msgid "spelling correction"
-msgstr "Chybějící volba"
+msgstr "Oprava pravopisu"
 
 #. TRANSLATORS: first %s is file name, second %s is file format.
 #: src/files.c:623
 #, c-format
 msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s -- %zu řádek (%s)"
+msgstr[1] "%s -- %zu řádky (%s)"
+msgstr[2] "%s -- %zu řádků (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nová vyrovnávací paměť"
 
 #: src/files.c:626
 msgid "DOS"
-msgstr ""
+msgstr "DOS"
 
 #: src/files.c:626
 msgid "Mac"
-msgstr ""
+msgstr "Mac"
 
 #: src/files.c:629
 #, c-format
 msgid "%s -- %zu line"
 msgid_plural "%s -- %zu lines"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s -- %zu řádek"
+msgstr[1] "%s -- %zu řádky"
+msgstr[2] "%s -- %zu řádků"
 
 #: src/files.c:640
 msgid "No more open file buffers"
@@ -231,36 +230,36 @@ msgstr "Soubor '%s' je nezapisovatelný"
 
 #. TRANSLATORS: Keep the next four messages at most 78 characters.
 #: src/files.c:937
-#, fuzzy, c-format
+#, c-format
 msgid "Read %zu line (Converted from DOS and Mac format)"
 msgid_plural "Read %zu lines (Converted from DOS and Mac format)"
-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)"
+msgstr[0] "Přečten %zu řádek (převeden z formátu DOS a Mac)"
+msgstr[1] "Přečteny %zu řádky (převedeny z formátu DOS a Mac)"
+msgstr[2] "Přečteno %zu řádků (převedeny z formátu DOS a Mac)"
 
 #: src/files.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "Read %zu line (Converted from Mac format)"
 msgid_plural "Read %zu lines (Converted from Mac format)"
-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)"
+msgstr[0] "Přečten %zu řádek (převeden z formátu Mac)"
+msgstr[1] "Přečteny %zu řádky (převedeny z formátu Mac)"
+msgstr[2] "Přečteno %zu řádků (převedeny z formátu Mac)"
 
 #: src/files.c:947
-#, fuzzy, c-format
+#, c-format
 msgid "Read %zu line (Converted from DOS format)"
 msgid_plural "Read %zu lines (Converted from DOS format)"
-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)"
+msgstr[0] "Přečten %zu řádek (převeden z formátu DOS)"
+msgstr[1] "Přečteny %zu řádky (převedeny z formátu DOS)"
+msgstr[2] "Přečteno %zu řádků (převedeny z formátu DOS)"
 
 #: src/files.c:953
-#, fuzzy, c-format
+#, c-format
 msgid "Read %zu line"
 msgid_plural "Read %zu lines"
-msgstr[0] "Přečten jeden řádek"
-msgstr[1] "Přečteny %lu řádky"
-msgstr[2] "Přečteno %lu řádků"
+msgstr[0] "Přečten %zu řádek"
+msgstr[1] "Přečteny %zu řádky"
+msgstr[2] "Přečteno %zu řádků"
 
 #: src/files.c:988
 msgid "New File"
@@ -282,850 +281,826 @@ msgstr "Čte se soubor"
 
 #. TRANSLATORS: The next six messages are prompts.
 #: src/files.c:1087
-#, fuzzy
 msgid "Command to execute in new buffer"
-msgstr "Příkaz k provedení v nové vyrovnávací paměti [z %s] "
+msgstr "Příkaz k provedení v nové vyrovnávací paměti"
 
 #: src/files.c:1090
-#, fuzzy
 msgid "Command to execute"
-msgstr "Příkaz k provedení [z %s] "
+msgstr "Příkaz k provedení"
 
 #: src/files.c:1098
-#, fuzzy, c-format
+#, c-format
 msgid "File to read unconverted into new buffer [from %s]"
-msgstr "Soubor k vložení do nové vyrovnávací paměti [z %s] "
+msgstr "Soubor k přečtení nepřeveden do nové vyrovnávací paměti [z %s] "
 
 #: src/files.c:1101
-#, fuzzy, c-format
+#, c-format
 msgid "File to read into new buffer [from %s]"
-msgstr "Soubor k vložení do nové vyrovnávací paměti [z %s] "
+msgstr "Soubor k přečtení do nové vyrovnávací paměti [z %s] "
 
 #: src/files.c:1106
-#, fuzzy, c-format
+#, c-format
 msgid "File to insert unconverted [from %s]"
-msgstr "Soubor k vložení [z %s] "
+msgstr "Soubor k vložení nepřeveden [z %s] "
 
 #: src/files.c:1109
-#, fuzzy, c-format
+#, c-format
 msgid "File to insert [from %s]"
 msgstr "Soubor k vložení [z %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
-msgstr "Nastavit pracovní adresář"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Neplatný pracovní adresář\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Nepodařilo se přejít do nadřazeného adresáře"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Neplatný zálohovací adresář\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nelze zapsat vně %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Příliš mnoho zálohovacích souborů?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu dočasného souboru s: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:2031
-#, fuzzy, c-format
+#: src/files.c:2028
+#, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
-msgstr[0] "Zapsán jeden řádek"
-msgstr[1] "Zapsány %lu řádky"
-msgstr[2] "Zapsáno %lu řádků"
+msgstr[0] "Zapsán %zu řádek"
+msgstr[1] "Zapsány %zu řádky"
+msgstr[2] "Zapsáno %zu řádků"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formát DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formát Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Záloha]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Připojit výběr na začátek souboru"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Připojit výběr na konec souboru"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Zapsat výběr do souboru"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Název souboru, na jehož začátek provést připojení"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Název souboru, na jehož konec provést připojení"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Název souboru k zapsání"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Soubor existuje -- nelze přepsat"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Uložit soubor pod JINÝM NÁZVEM? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Soubor \"%s\" existuje. PŘEPSAT?"
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
-msgstr ""
+msgstr "Soubor na disku se změnil"
 
-#: src/files.c:2291
+#: src/files.c:2285
 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:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(více)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Vložit text"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Zrušit zarovnání"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Zrušit současnou funkci"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Zobrazit tento text s nápovědou"
 
-#: src/global.c:541
-#, fuzzy
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
-msgstr "Zavřít nynější souborovou vyrovnávací paměť/Ukončit nano"
+msgstr "Zavřít nynější vyrovnávací paměť/Ukončit nano"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
-msgstr "Zapsat nynější soubor na disk"
+msgstr "Zapsat nynější vyrovnávací paměť (nebo označenou oblast) na disk"
 
-#: src/global.c:545
-#, fuzzy
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
-msgstr "Vložit další soubor do nynějšího"
+msgstr ""
+"Vložit další soubor do nynější vyrovnávací paměti (nebo do nové vyrovnávací "
+"paměti)"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
-msgstr "Hledat řetězec nebo regulární výraz"
+msgstr "Hledat dopředu řetězec nebo regulární výraz"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
-msgstr "Hledat řetězec nebo regulární výraz"
+msgstr "Hledat dozadu řetězec nebo regulární výraz"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:545
 msgid "Search forward for a string"
-msgstr "Hledat řetězec"
+msgstr "Hledat řetězec dopředu"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:546
 msgid "Search backward for a string"
-msgstr "Hledat řetězec"
+msgstr "Hledat řetězec dozadu"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Obnovit seznam souborů"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Jít na levý sloupec"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Jít na pravý sloupec"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:551
 msgid "Go to first row in this column"
-msgstr "Jít na pravý sloupec"
+msgstr "Jít na první řádek v tomto sloupci"
 
-#: src/global.c:558
-#, fuzzy
+#: src/global.c:552
 msgid "Go to last row in this column"
-msgstr "Jít na pravý sloupec"
+msgstr "Jít na poslední řádek v tomto sloupci"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Jít o jednu obrazovku nahoru"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Jít o jednu obrazovku dolů"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
-msgstr "Vyjmout nynější řádek a uložit jej ve schránce"
+msgstr "Vyjmout nynější řádek (nebo označenou oblast) a uložit jej ve schránce"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Vložit ze schránky do nynějšího řádku"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Vložit zarážku v poloze ukazatele"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Zobrazit polohu ukazatele"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Vyvolat ověřování pravopisu (je-li dostupné)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Nahradit řetězec nebo regulární výraz"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Jít na určitý řádek a sloupec"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Označit text počínaje od polohy ukazatele"
 
-#: src/global.c:576
-#, fuzzy
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
-msgstr "Zkopírovat nynější řádek a uložit jej ve schránce"
+msgstr ""
+"Zkopírovat nynější řádek (nebo označenou oblast) a uložit jej ve schránce"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
-msgstr ""
-"Opatřit poznámkou (komentovat) nebo Zrušit poznámku (odkomentovat) nynější "
-"řádek nebo označené řádky"
+msgstr "Odhodit nynější řádek (nebo označenou oblast)"
 
-#: src/global.c:578
-#, fuzzy
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
-msgstr ""
-"Opatřit poznámkou (komentovat) nebo Zrušit poznámku (odkomentovat) nynější "
-"řádek nebo označené řádky"
+msgstr "Odsadit nynější řádek (nebo označené řádky)"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
-msgstr ""
-"Opatřit poznámkou (komentovat) nebo Zrušit poznámku (odkomentovat) nynější "
-"řádek nebo označené řádky"
+msgstr "Zrušit odsazení nynějšího řádku (nebo označených řádků)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Zrušit poslední operaci"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Zopakovat poslední zrušenou operaci"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Jít o jeden znak zpět"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Jít o jeden znak vpřed"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Jít o jedno slovo zpět"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Jít o jedno slovo vpřed"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Jít na předchozí řádek"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Jít na další řádek"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Jít na začátek nynějšího řádku"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Jít na konec nynějšího řádku"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Jít na předchozí blok textu"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Jít na další blok textu"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Jít za konec odstavce; potom dalšího odstavce"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Jít na první řádek souboru"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Jít na poslední řádek souboru"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Jít na odpovídající závorky"
 
-#: src/global.c:606
-#, fuzzy
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
-msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnul ukazatel"
+msgstr ""
+"Posunout obraz o jeden řádek nahoru, aniž by se ukazatel pohnul textově"
 
-#: src/global.c:608
-#, fuzzy
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
-msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnul ukazatel"
+msgstr "Posunout obraz o jeden řádek dolů, aniž by se ukazatel pohnul textově"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Přepnout na předchozí souborovou vyrovnávací paměť"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Přepnout na další souborovou vyrovnávací paměť"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Vložit další znak přímo (takový jaký je)"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Vložit zarážku v poloze ukazatele"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Vložit zalomení řádku v poloze ukazatele"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Smazat znak v poloze ukazatele"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Smazat znak nalevo od polohy ukazatele"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Vyjmout zpět za ukazatelem po začátek slova"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Vyjmout od ukazatele po začátek dalšího slova"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Vyjmout od polohy ukazatele po konec souboru"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Zarovnat nynější odstavec"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Zarovnat celý soubor"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Spočítat počet slov, řádků a znaků"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnovit (překreslit) současnou obrazovku"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Odložit editor na pozadí (pokud je povoleno uspání)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Zkusit a doplnit nynější slovo"
 
-#: src/global.c:645
-#, fuzzy
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 "Opatřit poznámkou (komentovat) nebo Zrušit poznámku (odkomentovat) nynější "
-"řádek nebo označené řádky"
+"řádek (nebo označené řádky)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Uložit soubor bez optání"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Hledat další výskyt dozadu"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Hledat další výskyt dopředu"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
-msgstr ""
+msgstr "Začít/Zastavit nahrávání makra"
 
-#: src/global.c:652
-#, fuzzy
+#: src/global.c:646
 msgid "Run the last recorded macro"
-msgstr "Zrušit poslední operaci"
+msgstr "Spustit poslední nahrané makro"
 
-#: src/global.c:655
+#: src/global.c:649
 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:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Obrátit směr hledání"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Přepnout používání regulárních výrazů"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Vyvolat předchozí řetězec hledání/nahrazení"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Vyvolat další řetězec hledání/nahrazení"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Přepnout zápis ve formátu DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Přepnout zápis ve formátu Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Přepnout připojování na konec souboru"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Přepnout připojování na začátek souboru"
 
-#: src/global.c:671
+#: src/global.c:665
 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:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Provést vnější příkaz"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
-msgstr ""
+msgstr "Přenést nynější vyrovnávací paměť (nebo označenou oblast) do příkazu"
 
-#: src/global.c:675
-#, fuzzy
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
-msgstr "Nepřevádět soubory z formátů DOS/Mac"
+msgstr "Nepřevádět z formátů DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Přepnout používání nové vyrovnávací paměti"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Zavřít vyrovnávací paměť bez jejího uložení"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Jít do prohlížeče souborů"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Ukončit prohlížeč souborů"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Jít na první řádek v seznamu"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Jít na poslední řádek v seznamu"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Jít na předchozí řádek v seznamu"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Jít na další řádek v seznamu"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Jít do adresáře"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Vyvolat statický rozbor (je-li dostupný)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Jít na předchozí zprávu statického rozboru"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Jít na další zprávu statického rozboru"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Nápověda"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Zapsat"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Otevřít soubor"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Zarovnat"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Hledat"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Nahradit"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Jít do adresáře"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Vyjmout text"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Přenést text"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Pravopis"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Ukazatel"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Přejít na řádek"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Označit text"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopírovat text"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "VELKÁ PÍSMENA/malá písmena"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regulární výraz"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Zpět"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Žádné nahrazení"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
-msgstr ""
+msgstr "Starší"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
-msgstr ""
+msgstr "Novější"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Plné zarovnání"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "K závorce"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Uložit"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
-#, fuzzy
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
-msgstr "Hledat"
+msgstr "Kde byl"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Zpět"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Vpřed"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Předchozí slovo"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Další slovo"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Začátek"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Předchozí řádek"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Další řádek"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Posunout obraz nahoru"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Posunout obraz dolů"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Předchozí blok"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Další blok"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Začátek odstavce"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Konec odstavce"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Předchozí strana"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Další strana"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "První řádek"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Poslední řádek"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Předchozí soubor"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Další soubor"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Zarážka"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Smazat předcházející znak"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Smazat následující znak"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Vyjmout vlevo"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Vyjmout vpravo"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Vyjmout až po konec"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Počet slov"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Přímé zadání"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Odložit na pozadí"
 
-#: src/global.c:973
-#, fuzzy
+#: src/global.c:978
 msgid "Indent"
-msgstr "Odsadit text"
+msgstr "Odsadit"
 
-#: src/global.c:975
-#, fuzzy
+#: src/global.c:980
 msgid "Unindent"
-msgstr "Zrušit odsazení textu"
+msgstr "Zrušit odsazení"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Opatřit řádky poznámkou"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Doplnit"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
-msgstr ""
+msgstr "Nahrát"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
-msgstr ""
+msgstr "Spustit makro"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Označit text"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Statický rozbor"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Uložit"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Jít na text"
@@ -1151,18 +1126,16 @@ msgid "Backup File"
 msgstr "Soubor se zálohou"
 
 #: src/global.c:1039
-#, fuzzy
 msgid "No Conversion"
-msgstr "Verze"
+msgstr "Žádný převod"
 
 #: src/global.c:1044
 msgid "Execute Command"
 msgstr "Provést příkaz"
 
 #: src/global.c:1047
-#, fuzzy
 msgid "Pipe Text"
-msgstr "Kopírovat text"
+msgstr "Přenést text"
 
 #: src/global.c:1057
 msgid "To Files"
@@ -1186,11 +1159,11 @@ msgstr "Pravý sloupec"
 
 #: src/global.c:1074
 msgid "Top Row"
-msgstr ""
+msgstr "Horní řádek"
 
 #: src/global.c:1076
 msgid "Bottom Row"
-msgstr ""
+msgstr "Dolní řádek"
 
 #: src/global.c:1081
 msgid "Discard buffer"
@@ -1207,59 +1180,60 @@ msgstr "Další rozbor"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Režim s nápovědou"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Ukazovat stálou polohu ukazatele"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Plynulé posunování obrazu"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Posunovat obraz po řádcích místo po půlobrazovkách"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Plynulé zalamování dlouhých řádků"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Zobrazování bílých znaků"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Barevné zvýrazňování skladby"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Chytrá klávesa pro začátek dokumentu (Poloha 1)"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automaticky odsadit"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Vyjmout po konec"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Tvrdé zalamování dlouhých řádků"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Převod zadaných zarážek na mezery"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Podpora pro myš"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Odložit na pozadí"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Číslování řádků"
 
@@ -1493,7 +1467,6 @@ msgstr ""
 "\n"
 
 #: src/help.c:406
-#, fuzzy
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1502,30 +1475,28 @@ msgid ""
 "by '|' (the pipe symbol), the current contents of the buffer (or marked "
 "region) will be piped to the command.  "
 msgstr ""
-"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ěť, nezadávejte žádný příkaz.\n"
-"\n"
-" Následující funkční klávesy jsou dostupné v režimu \"Provést příkaz\":\n"
+"Text nápovědy pro Provést příkaz\n"
 "\n"
+" Tento režim vám umožňuje vložit výstup příkazu, který byl spuštěn v shellu, "
+"do současné vyrovnávací paměti (nebo do nové vyrovnávací paměti). Pokud "
+"příkaz předchází symbol '|' (svislice), do příkazu bude přenesen nynější "
+"obsah vyrovnávací paměť (nebo označené oblasti). "
 
 #: src/help.c:412
 msgid ""
 "If you just need another blank buffer, do not enter any command.\n"
 "\n"
 msgstr ""
+"Pokud jen potřebujete další prázdnou vyrovnávací paměť, nezadávejte žádný "
+"příkaz.\n"
+"\n"
 
 #: src/help.c:414
-#, fuzzy
 msgid ""
 " The following function keys are available in Execute Command 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 Provést příkaz:\n"
 "\n"
 
 #: src/help.c:417
@@ -1537,15 +1508,19 @@ msgid ""
 "PageDown you can switch to earlier and later messages.\n"
 "\n"
 msgstr ""
+"=== Statický rozbor ===\n"
+"\n"
+" V tomto režimu stavový řádek ukazuje zprávu o chybě nebo varování, a "
+"ukazatel je dán na příslušné místo v souboru.  Klávesami PageUp a PageDown "
+"se můžete pohybovat mezi staršími a novějšími zprávami.\n"
+"\n"
 
 #: src/help.c:422
-#, fuzzy
 msgid ""
 " The following function keys are available in Linter 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 Statický rozbor:\n"
 "\n"
 
 #: src/help.c:429
@@ -1636,19 +1611,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Chyba při zápisu %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Klávesa nepřípustná v režimu pouze pro čtení"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "V omezeném režimu je tato funkce vypnuta"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Nápověda není dostupná"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1657,7 +1632,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť zapsána do %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1666,7 +1641,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána do %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1675,312 +1650,328 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána: %s\n"
 
-#: src/nano.c:768
-#, fuzzy, c-format
+#: src/nano.c:764
+#, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
 "\n"
 msgstr ""
-"Použití: nano [VOLBY] [[+ŘÁDEK,SLOUPEC] SOUBOR]...\n"
+"Použití: nano [VOLBY] [[+ŘÁDEK[,SLOUPEC]] SOUBOR]...\n"
 "\n"
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
+"Pro umístění ukazatele na určitý řádek souboru, dejte před název souboru "
+"pomocí\n"
+"\"+\" číslo řádku. Číslo sloupce je možno přidat za čárku.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
+"Když je název souboru '-', nano čte data ze standardního vstupu.\n"
+"\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Volba\t\tdlouhá volba GNU\t\tVýznam\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Povolit chytrou klávesu pro začátek dokumentu (Poloha 1)"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Uložit zálohy stávajících souborů"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <adresář>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<adresář>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Adresář pro ukládání jedinečných zálohovacích souborů"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Použít tučný tisk místo opačného textu"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Převést zadané zarážky na mezery"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Ve výchozím nastavení soubor načíst do nové vyrovnávací paměti"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Použít soubory lock (ve stylu Vimu)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Zapisovat a číst historii hledání/nahrazování řetězců"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Nezkoumat soubory nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Jít na první řádek v tomto sloupci"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Opravit zmatek okolo kláves na číselné klávesnici"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Nepřidávat zalomení řádku na koncích souborů"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
-msgstr ""
+msgstr "Ořezat mezery na konci při tvrdém zalamování"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nepřevádět soubory z formátů DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Používat ještě jeden řádek k úpravám"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Zapsat & přečíst umístění polohy ukazatele"
 
-#: src/nano.c:824
-#, fuzzy
+#: src/nano.c:825
 msgid "-Q <regex>"
-msgstr "-Q <řetězec znaků>"
+msgstr "-Q <regex>"
 
-#: src/nano.c:824
-#, fuzzy
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
-msgstr "--quotestr=<řetězec znaků>"
+msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
-msgstr ""
+msgstr "Regulární výraz odpovídající uvozovkám"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Omezený režim"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Posunovat obraz po řádcích místo po půlobrazovkách"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#sloupce>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#sloupce>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavit velikost zarážky na #sloupce"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Provést rychlé vymazání stavového řádku"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Zobrazit informaci o verzi a ukončit"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Rozpoznávat hranice slov přesněji"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <řetězec znaků>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<řetězec znaků>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Které další znaky jsou částmi slov"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
-msgstr ""
+msgstr "-Y <name>"
 
-#: src/nano.c:844
-#, fuzzy
+#: src/nano.c:842
 msgid "--syntax=<name>"
-msgstr "--syntax=<řetězec znaků>"
+msgstr "--syntax=<name>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Vymezení skladby k užití pro obarvování"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
-msgstr ""
+msgstr "Nechat Bsp a Del vymazat označenou oblast"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
-msgstr ""
+msgstr "Při měkkém zalamování toto udělat na bílých znacích"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Nezalamovat dlouhé řádky natvrdo"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Stále ukazovat polohu ukazatele"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Odstranit záměnu kláves Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
-#, fuzzy
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
-msgstr "Ukázat čísla řádků před textem"
+msgstr "Ukazovat ukazatel v prohlížeči souborů a textu s nápovědou"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Ukázat tento text s nápovědou a ukončit"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Automaticky odsadit nové řádky"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Vyjmout od polohy ukazatele po konec řádku"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Ukázat čísla řádků před textem"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Povolit použití myši"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Soubor nečíst (pouze jej zapsat)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <adresář>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<adresář>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Nastavit pracovní adresář"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachovat klávesy XON (^Q) a XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#sloupce>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sloupce>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Nastavit bod tvrdého zalomení při sloupci #sloupce"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <program>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<program>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Povolit náhradní program na ověřování pravopisu"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Při ukončení automaticky bez zpětného dotazu uložit"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Ve výchozím nastavení soubor uložit ve formátu Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Režim pouze pro čtení (žádné změny nejsou možné)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Nezalamovat dlouhé řádky natvrdo"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Neukazovat dva pomocné řádky"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
-msgstr ""
+msgstr "Udělat, aby Ctrl+šipka vpravo zastavila na koncích slov"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Povolit odložení na pozadí (zastavit a zpět k shellu)"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " Verze GNU nano %s\n"
 
-#: src/nano.c:914
-#, fuzzy, c-format
+#: src/nano.c:920
+#, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
-msgstr " (C) 2014..%s přispěvatelé do nano\n"
+msgstr " (C) 2014-%s přispěvatelé do nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 "Adresa elektronické pošty: nano@nano-editor.org\tStránky: https://nano-"
 "editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1989,276 +1980,294 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Žádný název souboru"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Uložit změněnou vyrovnávací paměť? (odpověď \"Ne\" zahodí změny) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
-msgstr ""
+msgstr "Čtení ze standardního vstupu; napište ^D nebo ^D^D pro dokončení.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
-msgstr ""
+msgstr "Nepodařilo se otevřít stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
-msgstr ""
+msgstr "Promiňte! Nano spadlo!  Kód: %d.  Nahlaste, prosím, chybu.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Uspání není povoleno"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Rozvázat klávesu"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Nerozvázatelná klávesa: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Rozvázat klávesu: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Nerozvázatelná klávesa: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Rozvázat klávesu: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Rozvázat klávesu: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Název klávesy %s je neplatný"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Pište '%s -h' pro seznam dostupných voleb.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Špatný regulární výraz \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Neplatné číslo řádku nebo, číslo sloupce"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
-msgstr ""
+msgstr "Omyly v '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
-msgstr ""
+msgstr "Vítejte v nano.  Pro vyvolání základní nápovědy napište Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ano"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ne"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Vše"
 
-#: src/rcfile.c:152
-#, fuzzy, c-format
+#: src/rcfile.c:157
+#, c-format
 msgid "Error in %s on line %zu: "
-msgstr "Chyba v %s na řádku %lu: "
+msgstr "Chyba v %s na řádku %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Řetězce znaků pro regulární výrazy musí začínat a končit znakem \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Špatný regulární výraz \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Chybí název skladby"
 
-#: src/rcfile.c:281
-#, fuzzy
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
-msgstr "Chybí název skladby"
+msgstr "Nespárované uvozovky v názvu skladby (syntax)"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladba \"none\" je zamluvena"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Výchozí skladba \"default\" nepřijímá přípony"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Chybí název klíče"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Název klávesy zkratky je příliš krátký"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klávesové zkratky musí začínat \"^\", \"M\", nebo \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Název klávesy %s je neplatný"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Musí být zadána funkce spojená s klávesovou zkratkou"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Nelze spojit název \"%s\" s funkcí"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nelze spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkce \"%s\" neexistuje v nabídce \"%s\""
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Promiňte, ale klávesu \"%s\" nelze znovu přiřadit"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Chyba při rozšíření %s: %s"
 
-#: src/rcfile.c:602
-#, fuzzy, c-format
+#: src/rcfile.c:607
+#, c-format
 msgid "Color \"%s\" not understood"
-msgstr "Příkazu \"%s\" neporozuměno"
+msgstr "Barvě \"%s\" neporozuměno"
 
-#: src/rcfile.c:618
-#, fuzzy
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
-msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
+msgstr "Barva pozadí nemůže být světlá"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Příkazu \"%s\" musí předcházet příkaz \"syntax\""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Chybí řetězec regulárního výrazu po příkazu \"%s\""
 
-#: src/rcfile.c:697 src/rcfile.c:748
-#, fuzzy
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
-msgstr "Chybí řetězec regulárního výrazu"
+msgstr "Prázdný řetězec regulárního výrazu"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Výchozí skladba \"default\" nepřijímá regulární výrazy \"%s\""
 
-#: src/rcfile.c:855
-#, fuzzy, c-format
+#: src/rcfile.c:860
+#, c-format
 msgid "Missing argument after '%s'"
-msgstr "Chybí příkaz po \"%s\""
+msgstr "Chybí argument po \"%s\""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
+"Žádná klávesa není svázána s funkcí '%s' v nabídce '%s'.  Opouští se.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2266,58 +2275,58 @@ msgstr ""
 "Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-li změnit "
 "svá nastavení nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nepodařilo se najít skladbu \"%s\" k rozšíření"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Chybějící volba"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznámá volba \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Nelze vypnout volbu \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argument není platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
@@ -2360,12 +2369,12 @@ msgid "Replace with"
 msgstr "Nahradit"
 
 #: src/search.c:740
-#, fuzzy, c-format
+#, c-format
 msgid "Replaced %zd occurrence"
 msgid_plural "Replaced %zd occurrences"
-msgstr[0] "Nahrazen jeden výskyt"
-msgstr[1] "Nahrazeny %lu výskyty"
-msgstr[2] "Nahrazeno %lu výskytů"
+msgstr[0] "Nahrazen %zd výskyt"
+msgstr[1] "Nahrazeny %zd výskyty"
+msgstr[2] "Nahrazeno %zd výskytů"
 
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:768
@@ -2380,340 +2389,397 @@ msgstr "Žádná závorka"
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Značka nastavena"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Značka odstraněna"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 "Opatření poznámkou (komentování) není pro tento typ souboru podporováno"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Po konci souboru nelze opatřit poznámkou (komentovat)"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "Přidat text"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "Zalamovat řádky"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "Smazat text"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Ve výběru:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "Spojit řádek"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "Nahradit text"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Upravit nahrazení"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
-msgstr ""
+msgstr "Vymazat"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "Vyjmout text"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "Zrušit vyjmutí textu"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "Vložit text"
 
-#: src/text.c:846 src/text.c:1017
-#, fuzzy
+#: src/text.c:655 src/text.c:826
 msgid "indent"
-msgstr "Automaticky odsadit"
+msgstr "Odsadit"
 
-#: src/text.c:850 src/text.c:1021
-#, fuzzy
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "Automaticky odsadit"
+msgstr "Zrušit odsazení"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "Opatřit poznámkou"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "Zrušit poznámku"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Operace vrácena zpět (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nic k zopakování!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
-msgstr ""
+msgstr "Filtruje se"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
+msgstr "Nepodařilo se otevřít přenos dat: %s"
+
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Neplatný řetězec znaku uvozovek %s: %s"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Nyní lze zrušit zarovnání odstavce!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Zarovnat celý soubor"
 
-#: src/text.c:2606
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Zarovnat nynější odstavec"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Slovo není k nalezení: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Upravit nahrazení"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Další slovo..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 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:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Chyba při vyvolání „spell“"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Chyba při vyvolání „sort -f“"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokončeno"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Pro tento typ souboru není stanoven žádný statický rozbor!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Volá se statický rozbor. Počkejte, prosím"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Příkaz %s nevytvořil žádný zpracovatelný řádek"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
-msgstr ""
+msgstr "Žádné zprávy pro tento soubor"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Při první zprávě"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Při poslední zprávě"
 
-#: src/text.c:3415
-#, fuzzy, c-format
+#: src/text.c:3179
+#, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
-msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
+msgstr "%sSlov: %zu  Řádků: %zd  Znaků: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Přímé zadání"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
-msgstr ""
+msgstr "Žádný fragment slova"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Žádné další shody"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Žádné shody"
 
-#: src/utils.c:352 src/utils.c:364
-#, fuzzy
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
-msgstr "Nano už nemá paměť!"
+msgstr "Nano už nemá paměť!\n"
 
 #: src/winio.c:86
 msgid "Recording a macro..."
-msgstr ""
+msgstr "Nahrává se makro..."
 
 #: src/winio.c:89
 msgid "Stopped recording"
-msgstr ""
+msgstr "Nahrávání zastaveno"
 
 #: src/winio.c:100
 msgid "Cannot run macro while recording"
-msgstr ""
+msgstr "Během nahrávání nelze spustit makro"
 
 #: src/winio.c:106
 msgid "Macro is empty"
-msgstr ""
+msgstr "Makro je prázdné"
 
 #: src/winio.c:207
 msgid "Too many errors from stdin\n"
-msgstr ""
+msgstr "Příliš mnoho chyb z stdin\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Neznámá sekvence"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Vstup Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
-msgstr ""
+msgstr "Statický rozbor --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Adresář:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Změněno"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Pohled"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Omezený režim"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
-msgstr ""
+msgstr "Další varování byla potlačena"
 
-#: src/winio.c:3400
-#, fuzzy, c-format
+#: src/winio.c:3431
+#, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
-msgstr "Řádek %ld/%ld (%d%%), Sloupec %lu/%lu (%d%%), Znak %lu/%lu (%d%%)"
+msgstr "Řádek %zd/%zd (%d%%), Sloupec %zu/%zu (%d%%), Znak %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Textový editor nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "Verze"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Vyvíjeno:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Zvláštní poděkování:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "překladatelům a TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Pro ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "a všem nejmenovaným osobám, na které se zapomnělo..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Vložit text"
+
+#~ msgid "Unjustify"
+#~ msgstr "Zrušit zarovnání"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Vložit ze schránky do nynějšího řádku"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Plynulé posunování obrazu"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Nepřidávat zalomení řádku na koncích souborů"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Používat ještě jeden řádek k úpravám"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Nastavit bod tvrdého zalomení při sloupci #sloupce"
+
+#~ msgid "text add"
+#~ msgstr "Přidat text"
+
+#~ msgid "text delete"
+#~ msgstr "Smazat text"
+
+#~ msgid "text replace"
+#~ msgstr "Nahradit text"
+
+#~ msgid "text cut"
+#~ msgstr "Vyjmout text"
+
+#~ msgid "text uncut"
+#~ msgstr "Zrušit vyjmutí textu"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Neplatný řetězec znaku uvozovek %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Nyní lze zrušit zarovnání odstavce!"
+
 #~ msgid ""
 #~ "Warning: Modifying a file which is not locked, check directory permission?"
 #~ msgstr ""
diff --git a/po/da.po b/po/da.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-3.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-10-04 19:34+0200\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -39,9 +39,9 @@ msgstr "Kan ikke åbne katalog: %s"
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Afbrudt"
 
@@ -56,9 +56,9 @@ msgstr "Kan ikke gå uden for %s"
 msgid "Can't move up a directory"
 msgstr "Kan ikke gå et katalog op"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
@@ -104,17 +104,17 @@ msgstr "Dette er det eneste tilfælde"
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Ukendt syntaksnavn: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() mislykkedes: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) mislykkedes: %s"
@@ -207,7 +207,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu linje (%s)"
 msgstr[1] "%s -- %zu linjer (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -311,812 +311,816 @@ msgstr "Fil der skal indsættes uden konvertering [fra %s]"
 msgid "File to insert [from %s]"
 msgstr "Fil der skal indsættes [fra %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Ugyldigt arbejdskatalog\n"
 
 # afsluttende mellemrum efter strengen bevirker sandsynligvis at tekstmarkøren står rigtigt
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Ugyldigt katalog til sikkerhedskopi\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive uden for %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "For mange sikkerhedskopifiler?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Skrev %zu linje"
 msgstr[1] "Skrev %zu linjer"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Sikkerhedskopi]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Foranstil udvalg til fil"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Tilføj udvalg til fil"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Skriv udvalg til fil"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Filnavn at foranstille på"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Filnavn at tilføje på"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Filnavn at skrive"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "For lille"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Filen findes -- kan ikke overskrive"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Gem filen under ET ANDET NAVN? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Filen \"%s\" findes; OVERSKRIV? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Filen på disken er blevet ændret"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen er blevet ændret, siden du åbnede den; gem alligevel? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mere)"
 
 # max 10 tegn
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Luk"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Indsæt"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Afombryd"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Vis denne hjælpetekst"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Luk nuværende buffer / afslut nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Skriv den nuværende buffer (eller det markerede område) til disken"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Indsæt en anden fil i den nuværende buffer (eller i en ny buffer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Søg fremad efter en streng eller et regulært udtryk"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Søg bagud efter en streng eller et regulært udtryk"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Søg fremad efter en streng"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Søg bagud efter en streng"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Opdatér fillisten"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Gå til venstre kolonne"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Gå til højre kolonne"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Gå til første række i denne kolonne"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Gå til sidste række i denne kolonne"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Gå en skærm op"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Gå en skærm ned"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Klip aktuelle linje (eller markerede område) ud og gem den i udklipsbufferen"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Indsæt fra udklipsbufferen i aktuel linje"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Vis markørens position"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Erstat en streng eller et regulært udtryk"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Gå til linje- og kolonnenummer"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Markér tekst startende fra markørposition"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Kopiér aktuelle linje (eller markerede område) og gem den i udklipsbufferen"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Indryk aktuelle linje (eller markerede linjer)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Indryk aktuelle linje (eller markerede linjer)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Fjern indrykning for aktuelle linje (eller markerede linjer)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Fortryd sidste handling"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Omgør sidste fortrudte handling"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Gå et tegn bagud"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Gå et tegn fremad"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Gå et ord bagud"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Gå et ord fremad"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Gå til forrige linje"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Gå til næste linje"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Gå til begyndelsen af aktuel linje"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Gå til enden af aktuel linje"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Gå til forrige tekstblok"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Gå til næste tekstblok"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til afsnittets begyndelse; dernæst forrige afsnits"
 
 # må være præcist nok i denne lidt korte form.  Ellers bliver linjen for lang
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå til afsnittets slutning; dernæst næste afsnits"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Gå til filens første linje"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Gå til filens sidste linje"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Gå til modsvarende klamme"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rul en linje op uden at flytte markøren i teksten"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rul en linje ned uden at flytte markøren i teksten"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Gå til forrige filbuffer"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Gå til næste filbuffer"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Indsæt næste tasteanslag ordret"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Indsæt et linjeskift ved markørpositionen"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Fjern tegnet under markøren"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Fjern tegnet til venstre for markøren"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Klip bagud fra markøren til ordets begyndelse"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Klip fremad fra markøren til næste ords begyndelse"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klip fra markørpositionen til filens slutning"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Ombryd den aktuelle paragraf"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Ombryd hele filen"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Tæl ord, linjer og tegn"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Opdatér (genskriv) den aktuelle skærm"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Kør i baggrunden (hvis dette er slået til)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Forsøg at fuldføre nuværende ord"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Kommentér/fjern kommentar for nuværende linje (eller markerede linjer)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Gem fil uden at spørge"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Søg bagud efter næste forekomst"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Søg fremad efter næste forekomst"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Start/stop optagelse af en makro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Kør sidst optagede makro"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Slå forskel på store og små bogstaver til eller fra"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Omvend søgeretning"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Slå brug af regulære udtryk til eller fra"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Husk de foregående søg og erstat-strenge"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Husk de følgende søg og erstat-strenge"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Slå DOS-format til eller fra"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Slå Mac-format til eller fra"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Slå efterstillet tilføjelse til eller fra"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Slå foranstillet tilføjelse til eller fra"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Slå sikkerhedskopiering af originalfil til eller fra"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Udfør ekstern kommando"
 
 # lidt kortere end de andre lignende af hensyn til <80 tegn
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 "Send nuværende buffer (eller markeret område) til kommando gennem datakanal"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Konvertér ikke fra DOS/Mac-format"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Slå brug af ny buffer til eller fra"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Luk buffer uden at gemme den"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Gå til filbrowser"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Gå ud af filbrowseren"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Gå til første fil i listen"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Gå til sidste fil i listen"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Gå til forrige fil i listen"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Gå til næste fil i listen"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Start linteren, hvis tilgængelig"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Gå til forrige linter-besked"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Gå til næste linter-besked"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Få hjælp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Gem"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Læs fil"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Ombryd"
 
 # max 10 tegn
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Opdatér"
 
 # max 10 tegn
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Hvor er"
 
 # max 10 tegn
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Erstat"
 
 # max 16 tegn
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Gå til katalog"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Klip ud"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Send tekst gennem datakanal"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Stavetjek"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Position"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Til linje"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Markér tekst"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopiér tekst"
 
 # max 10 tegn
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "VersalFøls"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regex"
 
 # max 10 tegn
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Baglæns"
 
 # max 10 tegn
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "ErstatIkke"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
 # max 10 tegn
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "FuldOmbryd"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Til klamme"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Gem"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Hvor var"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Næste"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Fremad"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Næste ord"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Forrige linje"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Næste linje"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rul op"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rul ned"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Forrige blok"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Næste blok"
 
 # max 10 tegn
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "AfsnitStrt"
 
 # max 10 tegn
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "AfsnitSlut"
 
 # max 10 tegn
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "ForrigSide"
 
 # max 10 tegn
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "NæsteSide"
 
 # max 10 tegn
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "1. linje"
 
 # max 10 tegn
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Slutlinje"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Foreg. fil"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Næste fil"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Slet baglæns"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Fjern"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Klip venstre"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Klip højre"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "KlipResten"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Ordtælling"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Ordret"
 
 # max 10 tegn
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "I baggrund"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Indryk"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Fjern indrykning"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Kommentér linjer"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Fuldfør"
 
 # kontekst: at optage en makro
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Optag"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Kør makro"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Markér tekst"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Til Linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Gem"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Gå til tekst"
@@ -1202,59 +1206,60 @@ msgstr "Næste Lint-besked"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hjælpetilstand"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Konstant visning af markørposition"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Jævn rulning"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Rul linjevis frem for en halv skærm ad gangen"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Blød ombrydning af for lange linjer"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Visning af mellemrum"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Farvefremhævelse af syntaks"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Smart home-tast"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Hård ombrydning af for lange linjer"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering af skrevne tab-tegn til mellemrum"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Museunderstøttelse"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspension"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Linjenumre"
 
@@ -1618,19 +1623,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Fejl ved skrivning af %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Tasten er ugyldig i visningstilstand"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Denne funktion er slået fra i begrænset tilstand"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Hjælp er ikke tilgængelig"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1639,7 +1644,7 @@ msgstr ""
 "\n"
 "Bufferen skrevet til %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1648,7 +1653,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet til %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1657,7 +1662,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1668,7 +1673,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1677,7 +1682,7 @@ msgstr ""
 "Sæt linjenummer samt \"+\" foran filnavnet for at placere markøren på en\n"
 "bestemt linje.  Kolonnenummeret kan tilføjes efter et komma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1686,282 +1691,297 @@ msgstr ""
 "Når et filnavn er \"-\", læser nano data fra standard input.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Tilvalg\t\tLangt GNU-tilvalg\t\tBetydning\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Brug smart home-tast"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Gem sikkerhedskopier af eksisterende filer"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Katalog til at gemme unikke sikkerhedskopifiler"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Brug fed frem for omvendt video-tekst"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Konvertér skrevne tabulatortegn til mellemrum"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Læs en fil ind i en ny buffer som standard"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Brug (vim-stil) låsefiler"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Log & læs streng-historik for søg og erstat"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Se ikke på nanorc-filer"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Gå til første række i denne kolonne"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringsproblem med numerisk tastatur"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Tilføj ikke linjeskift til slut i filer"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Fjern afsluttende mellemrum ved hård ombrydning"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertér ikke fra DOS/Mac-format"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Brug en ekstra linje til redigering"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Gem & læs markørens position"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Regulært udtryk til at matche citationstegn"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Begrænset tilstand"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Rul linjevis frem for en halv skærm ad gangen"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Sæt bredden på et tabulatortegn til #kolonner"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Ryd statuslinje hurtigt"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Find ordgrænser mere præcist"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Hvilke andre tegn er dele af ord"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <navn>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<navn>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinition for farvelægning"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Brug kun blød ombrydning omkring blanktegn"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ombryd ikke kode-omsluttede lange linjer"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Vis markørposition hele tiden"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringsproblem med Tilbagetast/Slettetast"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Vis markør i filbrowser"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Vis denne hjælpetekst og afslut"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indryk automatisk nye linjer"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Vis linjenumre foran teksten"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Aktivér styring med mus"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Læs ikke filen (skriv den kun)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Angiv arbejdskatalog"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON- (^Q) og XOFF- (^S) taster"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Placér kode-ombrydningspunkt ved #kolonner"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Brug alternativ stavekontrol"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Gem automatisk ved afslutning, spørg ikke"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Gem en fil i Unix-format som standard"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Visningstilstand (skrivebeskyttet)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ombryd ikke kode-omsluttede lange linjer"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Vis ikke de to hjælpelinjer"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Lad Ctrl+Højre standse ved slutning af ord"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Slå suspend til"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s bidragyderne til nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWebside: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1970,272 +1990,292 @@ msgstr ""
 "\n"
 " Kompileringstilvalg:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Intet filnavn"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Gem ændret buffer?  (Svares \"nej\", FORKASTES ændringerne.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Læser fra standard-input; skriv ^D eller ^D^D for at afslutte.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Kunne ikke åbne stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Beklager!  Nano gik ned.  Kode: %d.  Indsend venligst en fejlrapport.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at vende tilbage til nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Kørsel i baggrunden er ikke slået til"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Ubunden tast"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Ubindelig tast: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Ubundet tast: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Ubindelig tast: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Ubundet tast: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Ubundet tast: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Tastenavnet %s er ugyldigt"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tast \"%s -h\" for en liste over tilgængelige tilvalg.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Dårligt regulært udtryk \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Fejl i \"%s\""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Velkommen til nano.  Tast Ctrl+G for at vise kortfattet hjælp."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nej"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alle"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Fejl i %s i linje %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Dårligt regulært udtryk \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Citationstegn i syntaksnavn mangler modpart"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\"-syntaksen er reserveret"
 
 # Extension skal her forstås som f.eks. 'nano --something extension', altså en slags argument, der kræves af et andet argument
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Tastenavn er for kort"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tastenavn skal starte med \"^\", \"M\" eller \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Tastenavnet %s er ugyldigt"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Skal angive en funktion at binde tast til"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Skal angive en menu (eller \"all\") hvori tasten bindes/løsnes"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan ikke associere navnet \"%s\" med en funktion"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktion \"%s\" findes ikke i menuen \"%s\""
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Beklager, tastetryk \"%s\" kan ikke være rebound"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fejl ved udvidelse af %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Farven \"%s\" ikke forstået"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "En baggrundsfarve må ikke være lys"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "En \"%s\"-kommando kræver forudgående \"syntax\"-kommando"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Mangler regex-streng efter \"%s\"-kommando"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Tom regex-streng"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "\"default\"-syntaksen kan ikke tage \"%s\"-regexer"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Mangler argument efter \"%s\""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument til \"%s\" mangler afsluttende \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Ingen tast bundet til funktionen \"%s\" i menuen \"%s\".  Afslutter.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2243,58 +2283,58 @@ msgstr ""
 "Hvis krævet, så brug nano med tilvalget -I for at justere dine nanorc-"
 "indstillinger.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke finde syntaks \"%s\" at udvide"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Mangler tilvalg"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukendt tilvalg \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke fjerne tilvalget \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tilvalget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argument er ikke en gyldig multibytestreng"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
@@ -2356,239 +2396,250 @@ msgstr "Ikke en klamme"
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Markering sat"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Markering fjernet"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Kommentarer understøttes ikke for denne filtype"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Kan ikke kommentere efter filafslutning"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Intet i fortrydelsesbufferen!"
 
-# De her mystiske "text add" og den slags indgår i strengen "Undid action (%s)" hvor %s er en af disse
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "tilføj tekst"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "linje bryd"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "slet tekst"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "I markering:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "sammenføj linje"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "tekst erstat"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Redigér en erstatning"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "klip tekst"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "indsæt tekst"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-# dette sker hvis teksten f.eks. er læst fra en fil
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "import af tekst"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
+msgstr "Retning"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "indryk"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "fjern indrykning"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "kommentér"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "fjern kommentar"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Fortrød handling (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Intet at omgøre!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtrering"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Kunne ikke åbne datakanal: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Dårlig anførselsstreng %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Ombryd hele filen"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Kan nu af-ombryde!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Ombryd den aktuelle paragraf"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Ord kan ikke findes: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Redigér en erstatning"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Næste ord..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Fejl ved kald af \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Fejl ved kald af \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Ingen linter defineret for denne filtype!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Gem ændret buffer før linting?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Starter linter, vent venligst"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fik 0 linjer der kunne fortolkes fra kommando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Denne besked er for uåbnet fil %s, åbn den i en ny buffer?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Ved første besked"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ved sidste besked"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sOrd: %zu  Linjer: %zd  Tegn: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Ordret input"
 
 # ?
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Intet ordfragment"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Ingen yderligere match"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Ingen match"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano har ikke mere hukommelse!"
@@ -2616,88 +2667,140 @@ msgstr "For mange fejl fra stdin"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Ukendt sekvens"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode-input: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Ændret"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Se"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Begrænset tilstand"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Yderligere advarsler blev udeladt"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "linje %zd/%zd (%d %%), kol %zu/%zu (%d %%), tegn %zu/%zu (%d %%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Præsenteres af:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Særlig tak til:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "de mange oversættere og TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!"
 
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tasten ugyldig i ikke-multibuffer-tilstand"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Indsæt"
+
+#~ msgid "Unjustify"
+#~ msgstr "Afombryd"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Indsæt fra udklipsbufferen i aktuel linje"
+
 #~ msgid "PrevHstory"
 #~ msgstr "ForrigHist"
 
 #~ msgid "NextHstory"
 #~ msgstr "NæstHist"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Jævn rulning"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Tilføj ikke linjeskift til slut i filer"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Brug en ekstra linje til redigering"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Placér kode-ombrydningspunkt ved #kolonner"
+
+# De her mystiske "text add" og den slags indgår i strengen "Undid action (%s)" hvor %s er en af disse
+#~ msgid "text add"
+#~ msgstr "tilføj tekst"
+
+#~ msgid "text delete"
+#~ msgstr "slet tekst"
+
+#~ msgid "text replace"
+#~ msgstr "tekst erstat"
+
+#~ msgid "text cut"
+#~ msgstr "klip tekst"
+
+#~ msgid "text uncut"
+#~ msgstr "indsæt tekst"
+
+# dette sker hvis teksten f.eks. er læst fra en fil
+#~ msgid "text insert"
+#~ msgstr "import af tekst"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Dårlig anførselsstreng %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Kan nu af-ombryde!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Start stavekontrollen, vent venligst"
 
@@ -3050,9 +3153,6 @@ msgstr "Tak for at du bruger nano!"
 #~ msgid "Down"
 #~ msgstr "Ned"
 
-#~ msgid "Direction"
-#~ msgstr "Retning"
-
 #~ msgid "Space"
 #~ msgstr "Mellemrum"
 
diff --git a/po/de.po b/po/de.po
@@ -6,14 +6,13 @@
 # Karl Eichwalder <keichwa@gmx.net>, 2001.
 # Florian König <floki@bigfoot.com>, 2000-2001.
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001-2006, 2008-2011, 2013-2014.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014-2018.
-#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014-2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-09 17:34+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-14 21:23+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"
@@ -21,8 +20,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: src/browser.c:67
 #, c-format
@@ -34,9 +33,9 @@ msgstr "Verzeichnis kann nicht geöffnet werden: %s"
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -51,9 +50,9 @@ msgstr "Außerhalb von %s kann nicht geschrieben werden"
 msgid "Can't move up a directory"
 msgstr "Ins übergeordnete Verzeichnis kann nicht gewechselt werden"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
@@ -99,17 +98,17 @@ msgstr "Das ist das einzige Auftreten"
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Unbekannter Syntaxname: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() fehlgeschlagen: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) fehlgeschlagen: %s"
@@ -204,7 +203,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu Zeile (%s)"
 msgstr[1] "%s -- %zu Zeilen (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
@@ -308,795 +307,793 @@ msgstr "In neuen Puffer ohne Umwandlung einzufügende Datei [von %s]"
 msgid "File to insert [from %s]"
 msgstr "Einzufügende Datei [von %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Ungültiges Arbeitsverzeichnis\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Ungültiges Arbeitsverzeichnis: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Sicherungsdatei konnte nicht geschrieben werden, weiter speichern? (N wenn "
-"unsicher) "
+"unsicher)"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Ungültiges Sicherungsverzeichnis\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Ungültiges Sicherungsverzeichnis: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Außerhalb von %s kann nicht geschrieben werden"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fehler beim Schreiben der Sicherungsdatei %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Zu viele Sicherungsdateien?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu Zeile geschrieben"
 msgstr[1] "%zu Zeilen geschrieben"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-Format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-Format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Sicherungsdatei]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Auswahl vorne an Datei anfügen"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Auswahl an Datei anhängen"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Auswahl in Datei schreiben"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Dateiname zum vorn Anfügen"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Dateiname zum Anhängen"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Dateiname zum Speichern"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Zu klein"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Datei existiert – kann nicht überschrieben werden"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Datei „%s“ existiert, ÜBERSCHREIBEN? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Die Datei wurde auf dem Datenträger geändert"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Datei wurde seit dem Öffnen geändert, dennoch speichern? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mehr)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Schließen"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Ausschn. r"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Ausr.rückgängig"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Aktuellen Puffer schließen / Nano beenden"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr ""
 "Den aktuellen Puffer (oder den markierten Bereich) auf Festplatte speichern"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Weitere Datei in die aktuellen (oder einen neuen) Puffer einfügen"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Nach einer Zeichenkette oder einem regulären Ausdruck vorwärts suchen"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Nach einer Zeichenkette oder einem regulären Ausdruck rückwärts suchen"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Vorwärts nach einer Zeichenkette suchen"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Rückwärts nach einer Zeichenkette suchen"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Dateiliste aktualisieren"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Zur linken Spalte springen"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Zur rechten Spalte springen"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Zur ersten Zeile in dieser Spalte springen"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Zur letzten Zeile in dieser Spalte springen"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Eine Bildschirmseite hoch gehen"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Eine Bildschirmseite runter gehen"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Die aktuelle Zeile (oder den markierten Bereich) ausschneiden und in der "
 "Zwischenablage speichern"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Aus der Zwischenablage einfügen"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Inhalt der Zwischenablage an der aktuellen Cursorposition einfügen"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Die aktuelle Cursorposition anzeigen"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Eine Zeichenkette oder einen regulären Ausdruck ersetzen"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Zu einer bestimmten Zeile und Spalte springen"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Text beginnend an Cursorposition markieren"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Die aktuelle Zeile (oder den markierten Bereich) kopieren und in der "
 "Zwischenablage speichern"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Die aktuelle Zeile oder den markierten Bereich verwerfen"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Die aktuelle Zeile oder die markierten Zeilen einrücken"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Die aktuelle Zeile oder die markierten Zeilen ausrücken"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Letzte Operation rückgängig machen"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Rückgängig gemachte Operation wiederholen"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Ein Zeichen rückwärts gehen"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Ein Zeichen vorwärts gehen"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Ein Wort rückwärts gehen"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Ein Wort vorwärts gehen"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Zur vorhergehenden Zeile gehen"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Zur folgenden Zeile gehen"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Zum Ende der aktuellen Zeile springen"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Zum vorhergehenden Textblock gehen"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Zum folgenden Textblock gehen"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Hinter das Ende des aktuellen Absatzes springen; dann des nächsten Absatzes"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Zur ersten Zeile der Datei springen"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Zur letzten Zeile der Datei springen"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Zur passenden Klammer springen"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Eine Zeile hochrollen, ohne den Cursor im Text zu bewegen"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Eine Zeile hinunterrollen, ohne den Cursor im Text zu bewegen"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Zum vorhergehenden Dateipuffer umschalten"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Zum folgenden Dateipuffer umschalten"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Nächstes Zeichen direkt (nicht interpretiert) einfügen"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Einen Tabulator an der Cursorposition einfügen"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Einen Zeilenumbruch an der Cursorposition einfügen"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Vom Cursor bis zum Beginn des Wortes ausschneiden"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Vom Cursor rückwärts bis zum Beginn des Wortes ausschneiden"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Vom Cursor bis zum Beginn des nächsten Wortes ausschneiden"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Vom Cursor vorwärts bis zum Beginn des nächsten Wortes ausschneiden"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Vom Cursor bis zum Dateiende ausschneiden"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Die gesamte Datei ausrichten"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Die Wörter, Zeilen und Zeichen zählen"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Den Editor in den Hintergrund schieben (wenn nano so eingerichtet ist)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Versuchen, das aktuelle Wort zu vervollständigen"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 "Die aktuelle Zeile oder die markierten Zeilen auskommentieren oder "
 "Kommentierung aufheben"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Datei ohne Nachfrage speichern"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Nächstes Vorkommen rückwärts suchen"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Nächstes Vorkommen vorwärts suchen"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Aufzeichnung eines Makros starten/stoppen"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Zuletzt aufgezeichnetes Makro ausführen"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Unterscheidung von Groß- und Kleinschreibung bei Suche umschalten"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Die Richtung der Suche umkehren"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Benutzung regulärer Ausdrücke umschalten"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Den nächsten Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Schreiben im DOS-Format umschalten"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Schreiben im Mac-Format umschalten"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Anhängen umschalten"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Vorn-Anfügen umschalten"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Sicherung existierender Dateien beim Speichern umschalten"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Externen Befehl ausführen"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Den aktuellen Puffer (oder den markierten Bereich) in Pipe senden"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Benutzung eines neuen Puffers umschalten"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Puffer schließen, ohne zu speichern"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Zum Dateibrowser gehen"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Den Dateibrowser beenden"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Zur ersten Datei der Liste springen"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Zur letzten Datei der Liste springen"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Zur vorigen Datei der Liste springen"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Zur nächsten Datei der Liste springen"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Zu Verzeichnis gehen"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Den Linter aufrufen (wenn verfügbar)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Zur vorhergehenden Linter-Meldung gehen"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Zur nächsten Linter-Meldung gehen"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Hilfe"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Speichern"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Datei öffnen"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Ausrichten"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Gehe zu Verz."
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Ausschneiden"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Text einfügen"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Rechtschr."
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Zu Zeile"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "GROSS/klein"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Reg. Ausdruck"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Rückwärts"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Keine Ersetzung"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Älter"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Neuer"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Kompl. Ausr."
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Zu Klammer"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Speichern"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Wo war"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Nächste"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Nächstes Wort"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Zeile zurück"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Zeile vor"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Vorh. Block"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Nächster Block"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Anf des Abs."
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Ende des Abs."
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Seite zurück"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Seite vor"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Erste Zeile"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Letzte Zeile"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Vorh. Datei"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Löschen"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Links ausschneiden"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Wort links"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Rechts ausschneiden"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Wort rechts"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Direkt"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "In den Hintergrund"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Einrücken"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Ausrücken"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Kommentarzeilen"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Vervollständigen"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Aufzeichnen"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Makro ausführen"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Text zappen"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Zum Linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Speichern"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Zu Text"
@@ -1176,59 +1173,59 @@ msgstr "Lintmld. vor"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Sanftes Rollen"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Springend rollen (halb-bildschirm-weise)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Überlange Zeilen fließend umbrechen"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Leerzeichenanzeige"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Intelligente Pos1-Taste"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatische Einrückung"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Überlange Zeilen hart umbrechen"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "In den Hintergrund"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Zeilennummerierung"
 
@@ -1411,7 +1408,7 @@ msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Die folgenden Funktionstasten sind im Suchbefehl-Modus des Dateibrowsers "
+"Die folgenden Funktionstasten sind im Suchbefehl-Modus des Dateibrowsers "
 "verfügbar:\n"
 "\n"
 
@@ -1508,8 +1505,8 @@ msgid ""
 msgstr ""
 "=== Linter ===\n"
 "\n"
-" In diesem Modus, zeigt die Status eine Fehlermeldung oder Warnung und der "
-"Cursor wird an die korrespondierende Position in der Datei gesetzt. Mit "
+" In diesem Modus, zeigt die Statusleiste eine Fehlermeldung oder Warnung und "
+"der Cursor wird an die korrespondierende Position in der Datei gesetzt. Mit "
 "BildAuf und BildAb können Sie zwischen den Positionen wechseln.\n"
 "\n"
 
@@ -1535,10 +1532,10 @@ msgstr ""
 "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 "
+"des UW-Pico-Texteditors zu imitieren. Es gibt vier Hauptbereiche: Die "
 "Titelzeile zeigt die Version des Programms, den Namen der momentan "
-"editierten Datei und ob die Datei verändert wurde oder nicht.  Das "
-"Hauptfenster enthält die zu bearbeitende Datei.  Die Statuszeile (die dritte "
+"editierten Datei und ob die Datei verändert wurde oder nicht. Das "
+"Hauptfenster enthält die zu bearbeitende Datei. Die Statuszeile (die dritte "
 "Zeile von unten) zeigt wichtige Meldungen.  "
 
 #: src/help.c:439
@@ -1610,19 +1607,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Taste unzulässig im Nur-Lese-Modus"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Im eingeschränkten Modus ist diese Funktion deaktiviert"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Hilfe ist nicht verfügbar"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1631,7 +1628,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1640,7 +1637,7 @@ msgstr ""
 "\n"
 "Puffer nicht in %s geschrieben: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1649,7 +1646,7 @@ msgstr ""
 "\n"
 "Puffer nicht geschrieben: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1660,7 +1657,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1671,7 +1668,7 @@ msgstr ""
 "kann\n"
 "nach einem Komma hinzugefügt werden.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1680,281 +1677,293 @@ msgstr ""
 "Wenn ein Dateiname „-“ ist, liest Nano aus der Standardeingabe.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tlange GNU-Option\t\tBedeutung\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Intelligente Pos1-Taste aktivieren"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Existierende Dateien beim Speichern sichern"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <Verz>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<Verz>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Verzeichnis zum Speichern von Sicherungsdateien"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Fettdruck anstelle von inversem Text benutzen"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Eingegebebene Tabulatoren in Leerzeichen umwandeln"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Eine Datei standardmäßig in einen neuen Puffer einlesen"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Sperrdateien benutzen (nach Art von Vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Verlauf der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Die nanorc-Dateien ignorieren"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Einen Markierungsbalken in dieser Spalte einblenden"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Verwirrung um Zehnertastatur lösen"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Keine Zeilenvorschübe an die Enden von Dateien anhängen"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Keine neue Zeile automatisch einfügen [Standard] "
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Bei hartem Umbruch angehängte Leerzeichen entfernen"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Eine Zeile mehr zum Editieren verwenden"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Cursorposition aufzeichnen und lesen"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <Ausdruck>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<Ausdruck>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Zu suchender regulärer Ausdruck"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Eingeschränkter Modus"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Zeilenweise rollen (statt halb-bildschirm-weise)"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#Spalten>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#Spalten>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Tabulatorbreite auf #Spalten setzen"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Schnelles Löschen der Statuszeile durchführen"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Versionsinfo ausgeben und beenden"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Wortgrenzen genauer erkennen"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <Zeichenkette>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<Zeichenkette>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Welche anderen Zeichen Wortteile sind"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <Name>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<Name>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Zu benutzende Syntaxdefinition für Einfärben"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Mit Rücktaste und Entf einen markierten Bereich löschen"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Fließenden Zeilenumbruch am Leerzeichen vornehmen"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Lange Zeilen automatisch hart umbrechen"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Vertauschung von Rücktaste/Entf beheben"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Zeile unter der Titelleiste leer lassen"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Text stets mit einer neuen Zeile enden lassen"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Cursor im Dateibrowser und Hilfetext anzeigen"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Diese Hilfe anzeigen und beenden"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Neue Zeilen automatisch einrücken"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Halbbildschirmweise statt zeilenweise rollen"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Vom Cursor bis zum Zeilenende ausschneiden"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Zeilennummern vor dem Text anzeigen"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Benutzung der Maus aktivieren"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Datei nicht lesen (nur schreiben)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <Verz>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<Verz>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Arbeitsverzeichnis setzen"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Tasten XON (^Q) und XOFF (^S) beibehalten"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#Spalten>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#Spalten>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Harten Umbruchpunkt bei #Spalten setzen"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Breite für harte Umbrüche und Ausrichtung festlegen"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <Prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<Prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Alternatives Rechtschreibprüfungsprogramm"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Beim Beenden ohne Rückfrage speichern"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Eine Datei standardmäßig im Unix-Format speichern"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Nur-Lesen-Modus (keine Veränderungen möglich)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Lange Zeilen nicht hart umbrechen"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Lange Zeilen nicht hart umbrechen [Standard] "
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Die zwei Hilfe-Zeilen nicht anzeigen"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Strg+Rechts als Stopp am Wortende einrichten"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Schieben in den Hintergrund (anhalten und zurück zur Shell) aktivieren"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Fließenden Zeilenumbruch aktivieren"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, Version %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s Die Nano-Mitwirkenden\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-Mail: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1963,277 +1972,296 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Kein Dateiname"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Geänderten Puffer speichern? (Mit „Nein“ werden die Änderungen VERWORFEN.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 "Aus der Standardeingabe wird gelesen, geben Sie ^D oder ^D^D zum Beenden "
 "ein.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Standardeingabe kann nicht geöffnet werden: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Standardeingabe konnte leider nicht erneut mit der Tastatur geöffnet "
 "werden.\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Hoppla! Nano ist abgestürzt  Code: %d.  Bitte melden Sie dies als Fehler.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Benutzen Sie „fg“, um zu Nano zurückzukehren.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspend ist nicht aktiviert"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Nicht zugewiesen"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Nicht zuweisbar: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Nicht zugewiesen: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Nicht zuweisbar: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Nicht zugewiesen: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Nicht zugewiesen: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Markierungsspalte „%s“ ist ungültig"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Option %s wird ignoriert; ist die Vorgabe\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angeforderte Tabulatorbreite „%s“ ist ungültig"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Angeforderte Füllgröße „%s“ ist ungültig"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Ungültiger regulärer Zitatausdruck „%s“: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Fehler in „%s“"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Willkommen bei Nano. Grundlegende Hilfe erhalten Sie mit Strg+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nein"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alle"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Fehler in %s in Zeile %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Zeichenketten für reguläre Ausdrücke müssen mit \" anfangen und enden"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Fehlender Syntaxname"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Fehlendes schließendes Zitatzeichen im Syntaxnamen"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Die Syntax „none“ ist reserviert"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Die Syntax „default“ akzeptiert keine Erweiterungen"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Fehlender Schlüsselname"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Schlüsselname ist zu kurz"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Schlüsselnamen müssen mit „^“, „M“ oder „F“ beginnen"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Schlüsselname „%s“ ist ungültig"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Die an die Taste zu bindende Funktion muss angegeben werden"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "„%s“ kann nicht auf eine Funktion gebunden werden"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "„%s“ kann nicht auf ein Menü gebunden werden"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktion „%s“ existiert im Menü „%s“ nicht"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Taste „%s“ kann leider nicht neu zugewiesen werden"
+msgid "Keystroke %s may not be rebound"
+msgstr "Taste %s kann nicht neu zugewiesen werden"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fehler beim Erweitern von %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Farbe „%s“ nicht verstanden"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Hintergrundfarbe kann nicht hell („bright“) sein"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Einem „%s“-Befehl muss ein „syntax“-Befehl vorausgehen"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Fehlende Regex-Zeichenkette nach „%s“-Befehl"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Leerer regulärer Ausdruck"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Die Syntax „default“ akzeptiert keine „%s“-Regexe"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Fehlendes Argument nach „%s“"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument „%s“ hat kein schließendes \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Der Funktion „%s“ im Menü „%s“ ist keine Taste zugeordnet. Abbruch.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2241,58 +2269,58 @@ msgstr ""
 "Bitte starten Sie nano bei Bedarf mit der Option „-I“, um Ihre nanorc-"
 "Einstellungen anzupassen\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Zu erweiternde Syntax „%s“ konnte nicht gefunden werden"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Fehlende Option"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Unbekannte Option „%s“"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Option „%s“ kann nicht zurückgesetzt werden"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argument ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Heimatverzeichnis kann nicht gefunden werden! Autsch!"
 
@@ -2354,237 +2382,245 @@ msgstr "Keine Klammer"
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Markierung gesetzt"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Markierung entfernt"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Kommentare werden für diesen Dateityp nicht unterstützt"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Nach dem Ende der Datei kann nicht kommentiert werden"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nichts im Rückgängig-Puffer!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "Text hinzu"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "Hinzufügung"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "Zeilenvorschub"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "Text löschen"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "Löschung"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "Zeile verbinden"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "Text ersetzen"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "Ersetzung"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "löschen"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "Text ausschneiden"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "ausschneiden"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "Text ausschneiden zurücknehmen"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "einfügen"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "Text einfügen"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "Einfügung"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "Einrücken"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "Ausrücken"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "Kommentieren"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "Nicht kommentieren"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Operation rückgängig gemacht (%s)"
+msgid "Undid %s"
+msgstr "%s wurde rückgängig gemacht"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nichts zu wiederholen!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Operation wiederholt (%s)"
+msgid "Redid %s"
+msgstr "%s wurde wiederholt"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Pipe konnte nicht erstellt werden"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Fork konnte nicht durchgeführt werden"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "Filtern"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Weiterleitung kann nicht geöffnet werden: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Ungültiges Zitatzeichen %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "Ausrichtung"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Auswahl wurde ausgerichtet"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Datei wurde ausgerichtet"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Absatzausrichtung kann jetzt rückgängig gemacht werden!"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Absatz wurde ausgerichtet"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Wort ist nicht auffindbar: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Nächstes Wort …"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liste falsch geschriebener Wörter wird erstellt, bitte warten..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Größe des Pipe-Puffers konnte nicht bestimmt werden"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Fehler beim Aufruf von „spell“"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Fehler beim Aufruf von „sort -f“"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Kein Linter für diesen Dateityp definiert!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Linter wird aufgerufen, bitte warten"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Keine verarbeitbaren Zeilen vom Befehl erhalten: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Keine Meldungen für diese Datei"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Bei erster Meldung"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Bei letzter Meldung"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sWörter: %zu  Zeilen: %zd  Zeichen: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Direkte Eingabe"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Kein Wort-Fragment"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Keine weiteren Treffer"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Keine Treffer"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano hat keinen Speicher mehr!\n"
 
@@ -2610,75 +2646,79 @@ msgstr "Zu viele Fehler aus der Standardeingabe\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Unbekannte Sequenz"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode-Eingabe: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Linter läuft --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Verändert"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Ansehen"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Eingeschränkt"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Weitere Warnungen werden unterdrückt"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "Zeile %zd/%zd (%d%%), Spalte %zu/%zu (%d%%), Zeichen %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Der Texteditor Nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "die zahlreichen Übersetzer und das TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "und alle Nichtgenannten …"
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
diff --git a/po/eo.po b/po/eo.po
@@ -1,17 +1,17 @@
 # Esperanto translations for GNU nano.
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# «Quejigo.»
+# «Apenaŭ ĉeĥigeblas.»
 #
 # Benno Schulenberg <vertaling@coevern.nl>, 2010, 2011, 2013, 2014.
-# Benno Schulenberg <vertaling@coevern.nl>, 2015, 2016, 2017, 2018.
+# Benno Schulenberg <vertaling@coevern.nl>, 2015, 2016, 2017, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-10 09:49+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-20 19:42+0100\n"
 "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -31,9 +31,9 @@ msgstr "Ne eblas malfermi dosierujon: %s"
 msgid "Go To Directory"
 msgstr "Iri dosierujon"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Rezignita"
 
@@ -48,9 +48,9 @@ msgstr "Ne eblas iri ekstere de %s"
 msgid "Can't move up a directory"
 msgstr "Ne eblas iri al supra dosierujo"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eraro dum legado de %s: %s"
@@ -96,17 +96,17 @@ msgstr "Ĉi tiu estas la ununura aperaĵo"
 msgid "No current search pattern"
 msgstr "Mankas ankoraŭ serĉendaĵo"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nekonata sintakso: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() fiaskis: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) fiaskis: %s"
@@ -200,7 +200,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu linio (%s)"
 msgstr[1] "%s -- %zu linioj (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nova bufro"
 
@@ -304,785 +304,783 @@ msgstr "Enmetenda dosiero (sen konverti) [el %s]"
 msgid "File to insert [from %s]"
 msgstr "Enmetenda dosiero [el %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Malvalida uzenda dosierujo\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Malvalida uzenda dosierujo: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "Malsukcesis skribi savkopion; ĉu tamen konservi?  (N se vi dubas) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Malvalida savkopia dosierujo\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Malvalida savkopia dosierujo: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ne eblas skribi ekstere de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eraro dum skribado de savkopio %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Ĉu troaj savkopioj?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eraro dum skribado de portempa dosiero: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eraro dum skribado de %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Skribiĝis %zu linio"
 msgstr[1] "Skribiĝis %zu linioj"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-aranĝo]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-aranĝo]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [savkopii]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Antaŭglui markaĵon al dosiero"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Postglui markaĵon al dosiero"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Konservi markaĵon en dosiero"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nomo de dosiero al kiu antaŭglui"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nomo de dosiero al kiu postglui"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nomo de skribota dosiero"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Tro eta"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Dosiero jam ekzistas -- ne eblas surskribi ĝin"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Ĉu konservi ALINOME? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Dosiero '%s' jam ekzistas; ĉu ANSTATAŬIGI? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Dosiero sur disko modifiĝis"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Dosiero modifiĝis post malfermo; ĉu tamen surskribi ĝin? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(plu)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Fini"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Fermi"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Alglui"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Malrektigi"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Rezigni la nunan operacion"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Montri ĉi tiun helptekston"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Fermi la nunan bufron / Eliri el 'nano'"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Konservi la nunan bufron (aŭ markitan regionon) sur disko"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Enmeti alian dosieron en la nuna bufro (aŭ en nova bufro)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Antaŭen serĉi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Malantaŭen serĉi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Serĉi antaŭen parton de dosiernomo"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Serĉi malantaŭen parton de dosiernomo"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Aktualigi dosierliston"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Iri al plej liva kolumno"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Iri al plej dekstra kolumno"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Iri al unua vico en ĉi tiu kolumno"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Iri al lasta vico en ĉi tiu kolumno"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Iri unu paĝo supren"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Iri unu paĝo suben"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Eltondi linion (aŭ markitan regionon) kaj gardi ĝin en tondujo"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Glui tekstaĵon el la tondujo en la nuna linio"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Glui tekstaĵon el la tondujo al la nuna kursora pozicio"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Montri la pozicion de la kursoro"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Ruli literumilon (se disponeblas)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Anstataŭigi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Iri al lininumero (kaj kolumnnumero)"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marki tekston ekde la kursora pozicio"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Kopii linion (aŭ markitan regionon) kaj gardi ĝin en tondujo"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Forĵeti la nunan linion (aŭ markitan regionon)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Deŝovi enen la nunan linion (aŭ markitajn liniojn)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Deŝovi eksteren la nunan linion (aŭ markitajn liniojn)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Malfari la lastan agon"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Refari la lastan malfaratan agon"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Iri unu signon malantaŭen"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Iri unu signon antaŭen"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Iri unu vorton malantaŭen"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Iri unu vorton antaŭen"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Iri al la supra linio"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Iri al la suba linio"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Iri al la komenco de la nuna linio"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Iri al la fino de la nuna linio"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Iri al antaŭa tekstbloko"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Iri al posta tekstbloko"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Iri al la unua linio de la dosiero"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Iri al la lasta linio de la dosiero"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Iri al para krampo"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rulumi unu linion supren sen movi la kursoron tekste"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rulumi unu linion suben sen movi la kursoron tekste"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Ŝalti al malsekva dosierbufro"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Ŝalti al sekva dosierbufro"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Enmeti la tujsekvan klavon tielkiel"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Enmeti tabon je la kursora pozicio"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
-msgstr "Enmeti novlinion je la kursora pozicio"
+msgstr "Enmeti linfinon je la kursora pozicio"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Forigi la signon sub la kursoro"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Forigi la signon maldekstran de la kursoro"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
 msgstr "Forigi ekde de la kursoro ĝis antaŭa vortkomenco"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
 msgstr "Forigi ekde de la kursoro ĝis posta vortkomenco"
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Rektigi la nunan alineon"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Rektigi la tutan dosieron"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Nombri la vortojn, liniojn, kaj signojn"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Aktualigi (redesegni) la nunan ekranon"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Paŭzigi la redaktilon (se paŭzigebleco enŝaltitas)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Provi kompletigi la nunan vortpecon"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "(Mal)komentigi la nunan linion (aŭ markitajn liniojn)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Konservi dosieron sen demandi"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Serĉi sekvan okazon malantaŭen"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Serĉi sekvan okazon antaŭen"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Komenci/fini registron de makroo"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Ruli laste registritan makroon"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ŝalti la usklecdistingon de serĉo"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Mali la direkton de serĉo"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Ŝalti la uzon de regulesprimoj"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Repreni la antaŭan serĉitan signoĉenon"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Repreni la postan serĉitan signoĉenon"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Ŝalti la uzon de DOS-aranĝo"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Ŝalti la uzon de Mac-aranĝo"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Ŝalti postgluon"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Ŝalti antaŭgluon"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Ŝalti fari savkopion de redaktota dosiero"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Ruli eksteran komandon"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Dukti la nunan bufron (aŭ markitan regionon) al la komando"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Ŝalti konverton el DOS-/Mac-aranĝo"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Ŝalti la uzon de nova bufro"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Fermi bufron sen konservi ĝin"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Iri al dosieresplorilo"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Eliri el dosieresplorilo"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Iri al la unua dosiero en la listo"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Iri al la lasta dosiero en la listo"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Iri al la malsekva dosiero en la listo"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Iri al la sekva dosiero en la listo"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Iri al indikota dosierujo"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Iri al la antaŭa mesaĝo de la kontrolilo"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Iri al la sekva mesaĝo de la kontrolilo"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Helpo"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Konservi"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Enmeti"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Rektigi"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Remontri"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Serĉi"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Anstataŭigi"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Iri dosierujon"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Eltondi"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Alglui"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Literumo"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pozicio"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Iri linion"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Malfari"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refari"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Markŝalto"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopii tekston"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Usklece"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regulesprime"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Malantaŭen"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Ne anstataŭigi"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Pli olda"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Pli freŝa"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Rektigi ĉion"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Al krampo"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Konservi nun"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Serĉi"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Antaŭan okazon"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Sekvan okazon"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Malantaŭen"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Antaŭen"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Antaŭa vorto"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Posta vorto"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Linikomencen"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Linifinen"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Linio supren"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Linio suben"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rulumi supren"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rulumi suben"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Antaŭa bloko"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Posta bloko"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Alineo-eken"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Alineo-finen"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Paĝo supren"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Paĝo suben"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Unua linio"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Lasta linio"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Malsekvan"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Sekvan"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "«Tabo»"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "«Enigo»"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "«Retropaŝo»"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "«Forigo»"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Vorttondi liven"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Vorthaki liven"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Vorttondi dekstren"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Vorthaki dekstren"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Tondi reston"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Nombri vortojn"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Konforme"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Paŭzigi"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Endeŝovi"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Eldeŝovi"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Komentigi"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Kompletigi"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Registri"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Ruli makroon"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Forĵeti"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Trakombi"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Konservi nun"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Serĉi"
@@ -1162,59 +1160,59 @@ msgstr "Sekva mesaĝo"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Helpaj linioj"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Daŭra montro de kursora pozicio"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Rulumi linie"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Salta rulumo (po duon-ekrano)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ĉirkaŭfluigo de tro longaj linioj"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
-msgstr "Montri blankspacojn"
+msgstr "Montro de blankspacoj"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
-msgstr "Kolore montri sintakson"
+msgstr "Kolora montro de sintakso"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Inteligenta klavo «Komencen»"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
-msgstr "Aŭtomate deŝovi"
+msgstr "Aŭtomata deŝovo"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
-msgstr "Tondi ekde kursoro ĝis linifino"
+msgstr "Tondo ekde kursoro ĝis linifino"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
-msgstr "Faldi longajn liniojn (enmeti linifinon)"
+msgstr "Faldo de longaj linioj"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
-msgstr "Konverti tajpatajn tabojn al spacoj"
+msgstr "Konverto de tajpataj taboj al spacoj"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Subteno de muso"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Paŭzigebleco"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Lininumeroj"
 
@@ -1582,19 +1580,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Eraro dum skribado de %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Klavo ne validas en rigarda reĝimo"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Ĉi tiu funkcio malebligatas dum limigita reĝimo"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Helpo ne haveblas"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1603,7 +1601,7 @@ msgstr ""
 "\n"
 "Bufro skribiĝis al %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1612,7 +1610,7 @@ msgstr ""
 "\n"
 "Bufro ne skribiĝis al %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1621,7 +1619,7 @@ msgstr ""
 "\n"
 "Bufro ne skribiĝis: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1632,7 +1630,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1641,7 +1639,7 @@ msgstr ""
 "Por meti kursoron en iu linio de la dosiero, specifu la lininumeron kun '+'\n"
 "antaŭ la dosiernomo.  Eblas aldoni kolumnnumeron post komo.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1650,281 +1648,295 @@ msgstr ""
 "Kiam dosiernomo estas '-', nano legas datumojn el ĉefenigujo.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcio\t\tLonga GNU-a opcio\t  Signifo\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "estigi klavon «Komencen» inteligenta"
 
-#: src/nano.c:780
+# La sekvaj mesaĝoj komencas en traduko per minusklo,
+# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "fari savkopion de ekzistanta dosiero"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <ujo>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<ujo>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "fari unikajn savkopiojn, konservi ĉi tie"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "uzi grasan anstataŭ negativan tekston"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "konverti tajpatajn tabojn al spacoj"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "enmeti dosieron defaŭlte en nova bufro"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "uzi riglajn dosierojn (kiel je 'vim')"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "memori historion de serĉitaj signoĉenoj"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "ignori 'nanorc'-dosierojn"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "montri gvidan strion en tiu ĉi kolumno"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "fliki konfuzon je cifera klavareto"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "ne aldoni novlinion al fino de dosiero"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "ne aldoni aŭtomatan linifinon [defaŭlto]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "fortranĉi finspacojn je linifaldo"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "ne konverti el DOS-/Mac-aranĝo"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "uzi unu plian linion por redakti"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "konservi kaj restaŭri kursoran pozicion"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <esprimo>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<esprimo>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "regulesprimo kiu kongruas kun citado"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "limigi aliron al dosiersistemo"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "rulumi po linio anstataŭ po duon-ekrano"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <nombro>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<nombro>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "uzenda larĝo de tabo"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "viŝi statlinio tuj post sekva klavtuŝo"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "montri programversion kaj fini"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "detekti vortlimojn pli akurate"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <ĉeno>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<ĉeno>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "kiuj aliaj signoj formas vortojn"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nomo>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nomo>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "uzenda sintaksdifino por kolorigi"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Bsp kaj Del forĵetas markitan regionon"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "dum ĉirkaŭfluigo, fendi je blankspacoj"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "aŭtomate faldi tro longan linion"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "daŭre montri kursoran pozicion"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "fliki konfuzon pri «Retropaŝo»/«Forigo»"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "lasi vakan la linion sub la supra"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "finigi tekston ĉiam per linifino"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "montri kursoron en helpo kaj esplorilo"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "montri ĉi tiun helptekston kaj fini"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "aŭtomate deŝovi novajn liniojn"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "rulumi po duon-ekrano, ne po linio"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "forigi ekde de la kursoro ĝis linifino"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "montri lininumerojn antaŭ la teksto"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "ebligi uzon de muso"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "ne legi dosieron (nur skribi ĝin)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <ujo>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<ujo>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "uzenda kuranta dosierujo"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "ebligi klavojn ^Q (XON) kaj ^S (XOFF)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <nombro>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<nombro>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
 msgstr "uzenda larĝo por faldi kaj rektigi"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <programo>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<programo>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "uzenda alternativa literumilo"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "aŭtomate konservi je fino, sen demandi"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "konservi dosieron defaŭlte Unix-aranĝe"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "rigarda reĝimo (ne eblas redakti)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "ne faldi longajn liniojn"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "ne faldi longan linion [defaŭlto]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "ne montri la du helpajn liniojn"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "igi Stir+Dekstren halti post vortfinoj"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "ebligi paŭzigon"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "ĉirkaŭfluigi longajn liniojn"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versio %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s la kontribuantoj al nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Retpoŝto: <nano@nano-editor.org>    TTT: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1933,329 +1945,348 @@ msgstr ""
 "\n"
 " Kompilaj opcioj:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Vaka dosiernomo"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Ĉu konservi modifitan bufron?  ('N' DETRUOS ŝanĝojn) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Legado el ĉefenigujo; tajpu ^D aŭ ^D^D por fini.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Malsukcesis malfermi ĉefenigujon: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevitas SIGHUP aŭ SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Pardonu! Nano kraŝis!  Kodo: %d.  Bonvolu raporti mison.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Uzu 'fg' por reveni al 'nano'.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Paŭzigebleco ne enŝaltitas"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "(enŝaltitas)"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "(malŝaltitas)"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Neligita klavo"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Neligebla klavo: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Neligita klavo: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Neligebla klavo: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Neligita klavo: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Neligita klavo: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Gvida kolumno '%s' ne validas"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Opcio %s ignoriĝas; ĝi estas la defaŭlto\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Petata tablarĝo '%s' ne validas"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Petata faldlarĝo '%s' ne validas"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tajpu '%s -h' por vidi liston de eblaj opcioj.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Malbonas regulesprimo \"%s\": %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ne validas numero de linio aŭ kolumno"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Eraroj en '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Bonvenon al nano.  Por baza helpo, tajpu Stir+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Jj"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
 # La unua litero ne povas esti plurbitoka, tial senĉapela.
 # Inkluzivas "Tt" (Tute) ĉar tiuj uziĝis antaŭe.
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "CcĈĉTt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Jes"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ne"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Ĉiujn"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Eraro en %s en linio %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento '%s' havas senparan citilon \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Malbonas regulesprimo \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Mankas nomo de sintakso"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Senpara citilo en nomo de sintakso"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintakso 'none' estas rezervita"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintakso 'default' ne permesas finaĵojn"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Mankas nomo de klavo"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Klavnomo tro mallongas"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klavnomo devas komenci kun '^', 'M', aŭ 'F'"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Klavnomo '%s' ne validas"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 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:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Ĉeno '%s' ne estas nomo de funkcio"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ĉeno '%s' ne estas nomo de menuo"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkcio '%s' ne ekzistas en menuo '%s'"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr "Ne eblas religi klavĉenon '%s'"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Eraro dum malvolvo de %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Koloro '%s' ne estas komprenata"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Fona koloro ne povas esti hela"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Komando '%s' bezonas antaŭan komandon 'syntax'"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Mankas nomo de koloro"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Mankas regulesprima signoĉeno post komando '%s'"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Vaka regulesprima signoĉeno"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' bezonas paran 'end='"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Sintakso 'default' ne permesas '%s'-aĵon"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Mankas argumento post '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argumento '%s' mankas finan citilon"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Neniu klavo estas ligita al funkcio '%s' en menuo '%s'.  Eliro.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, 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:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ne troviĝas sintakso '%s' por pliampleksigi"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintakso '%s' ne havas kolorajn komandojn"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komando '%s' ne permesatas en inkluda dosiero"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komando '%s' ne estas komprenata"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Mankas opcio"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nekonata opcio '%s'"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ne eblas malŝalti opcion '%s'"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcio '%s' bezonas argumenton"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Neblankaj signoj bezonatas"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Du unukolumnaj signoj bezonatas"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
 
@@ -2317,244 +2348,245 @@ msgstr "Ne estas krampo"
 msgid "No matching bracket"
 msgstr "Ne ekzistas para krampo"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Markado enŝaltitas"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Malŝaltitas"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eraro dum lanĉo de '%s'"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Komentigi ne eblas en ĉi tiu dosiertipo"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Ne eblas komentigi post fino de dosiero"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nenio por malfari!"
 
-# La originaloj estas sennecese multvortecaj.
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr "aldono"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "linifaldo"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
 msgstr "forigo"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "linikunigo"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
 msgstr "anstataŭigo"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "forĵeto"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr "eltondo"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr "algluo"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
 msgstr "enmeto"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "endeŝovo"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "eldeŝovo"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "komentigo"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "malkomentigo"
 
-# La originalo estas sennecese multvorteca.
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr "Malfariĝis %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nenio por refari!"
 
-# La originalo estas sennecese multvorteca.
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr "Refariĝis %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Malsukcesis krei dukton"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Malsukcesis krei novan procezon"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Malsukcesis malfermi dukton: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Signoĉeno de citiloj %s ne validas: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "rektigo"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Nun eblas malrektigi!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Rektiĝis markaĵo"
 
-#: src/text.c:2606
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Rektiĝis tuta bufro"
+
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Rektiĝis alineo"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Netrovebla vorto: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Redaktu anstataŭigon"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Sekva vorto..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Ne eblas eltrovi grandon de dukta bufro"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Eraro dum lanĉo de 'spell'"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Eraro dum lanĉo de 'sort -f'"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Eraro dum lanĉo de 'uniq'"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Literuma kontrolo malsukcesis: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Literuma kontrolo malsukcesis: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Finiĝis literuma kontrolo"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Ne definiĝis sintaks-kontrolilo por ĉi tiu tipo de dosiero"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo? "
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Ekruliĝas sintaks-kontrolilo; bonvolu atendi..."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Riceviĝis nul analizeblaj linioj de la komando «%s»"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ĉi tiu mesaĝo estas por malferma dosiero %s; ĉu malfermi ĝin en nova bufro? "
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Neniu mesaĝo por ĉi tiu dosiero"
 
-# La sekvaj mesaĝoj komencas en traduko per minusklo,
-# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Ĉi tiu estas la unua mesaĝo"
 
-# La sekvaj mesaĝoj komencas en traduko per minusklo,
-# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ĉi tiu estas la lasta mesaĝo"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%s%zu vortoj  ◆  %zd linioj  ◆  %zu literoj"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "En markaĵo:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Konforma enigo"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Mankas vortpeco"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Malestas pliaj kongruoj"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Nenio kongruas"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Mankas sufiĉa memoro por 'nano'!\n"
 
@@ -2580,79 +2612,104 @@ msgstr "Tro da eraroj el ĉefenigujo\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Nekonata klavkodo"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Enigo de Unikodo: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Trakombo --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DOSIERUJO:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Ŝanĝita"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Nur rigardi"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Limigita"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Pluaj avertoj subpremiĝis"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "linio %zd/%zd (%d%%) ◆ kolumno %zu/%zu (%d%%) ◆ litero %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "La tekstredaktilo 'nano'"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Prezentita al vi per:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Specialan dankon al:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "la “Free Software Foundation”"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "la multaj tradukantoj kaj la TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "por 'ncurses':"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "kaj iuj ajn kiujn ni forgesis..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Dankon pro via uzo de 'nano'!"
 
+#~ msgid "Unjustify"
+#~ msgstr "Malrektigi"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Glui tekstaĵon el la tondujo en la nuna linio"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Rulumi linie"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "ne aldoni novlinion al fino de dosiero"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "uzi unu plian linion por redakti"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Signoĉeno de citiloj %s ne validas: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Nun eblas malrektigi!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Klavo nur validas en multbufra moduso"
 
@@ -2846,9 +2903,6 @@ msgstr "Dankon pro via uzo de 'nano'!"
 #~ msgid " GNU nano version %s (compiled %s, %s)\n"
 #~ msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
 
-#~ msgid "line wrap"
-#~ msgstr "linifaldo"
-
 #~ msgid "Insert File"
 #~ msgstr "Enmeti dosieron"
 
diff --git a/po/es.po b/po/es.po
@@ -1,5 +1,5 @@
 # Mensajes en español para GNU nano.
-# Copyright (C) 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Jordi Mallach <jordi@sindominio.net>, 2000, 2001, 2002.
@@ -7,13 +7,13 @@
 # Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>, 2006.
 # Jorge González <aloriel@gmail.com>, 2013.
 # Benno Schulenberg <benno@vertaalt.nl>, 2015.
-# Antonio Ceballos <aceballos@gmail.com>, 2015, 2016, 2017, 2018.
+# Antonio Ceballos <aceballos@gmail.com>, 2015, 2016, 2017, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-3.2-pre1\n"
+"Project-Id-Version: nano-4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-11 16:30+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-14 07:45+0100\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
@@ -34,9 +34,9 @@ msgstr "No se puede abrir el directorio: %s"
 msgid "Go To Directory"
 msgstr "Ir al directorio"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -51,9 +51,9 @@ msgstr "No se puede salir de %s"
 msgid "Can't move up a directory"
 msgstr "No se puede ascender de directorio"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Error leyendo «%s»: %s"
@@ -99,17 +99,17 @@ msgstr "Ésta es la única coincidencia"
 msgid "No current search pattern"
 msgstr "No hay patrón de búsqueda"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nombre de sintaxis desconocido: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() ha fallado: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) ha fallado: %s"
@@ -209,7 +209,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu línea (%s)"
 msgstr[1] "%s -- %zu líneas (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Búfer nuevo"
 
@@ -313,797 +313,796 @@ msgstr "Fichero para insertar sin convertir [desde %s]"
 msgid "File to insert [from %s]"
 msgstr "Fichero que insertar [desde %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Directorio de operación no válido\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Directorio de operación no válido: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
-msgstr "Directorio de respaldo no válido\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Directorio de respaldo no válido: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No se puede escribir fuera de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Error al escribir el fichero de respaldo «%s»: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheros de respaldo?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Error al escribir en el fichero temporal: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Error al escribir «%s»: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu línea escrita"
 msgstr[1] "%zu líneas escritas"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Anteponer selección al fichero"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Añadir selección al fichero"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Escribir selección al fichero"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nombre del fichero al que añadir"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Demasiado pequeño"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "El fichero existe -- no se puede sobreescribir"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "¿Guardar el fichero con un NOMBRE DIFERENTE? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "El fichero «%s» ya existe, ¿SOBREESCRIBIR? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "El fichero en disco ha cambiado"
 
-#: src/files.c:2291
+#: src/files.c:2285
 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:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(más)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Salir"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Pegar txt"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Desjustif."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cancelar la función actual"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Cerrar el búfer actual / Salir de nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Escribir el búfer actual (o la región marcada) a disco"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Insertar otro fichero en el búfer actual (o en un nuevo búfer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Buscar hacia delante una cadena o expresión regular"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Buscar hacia atrás una cadena o expresión regular"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Buscar una cadena hacia delante"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Buscar una cadena hacia atrás"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Actualizar la lista de ficheros"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Ir a la columna de la izquierda"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Ir a la columna de la derecha"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Ir a la primera fila de esta columna"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Ir a la última fila de esta columna"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Ir una pantalla hacia arriba"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Ir una pantalla hacia abajo"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Cortar la línea actual (o la región marcada) y guardarla en el cutbuffer"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Pegar el cutbuffer en la línea actual"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Pegar el contenido del cutbuffer en la posición del cursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Mostrar la posición del cursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Reemplazar una cadena o expresión regular"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Ir a una línea y columna"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto desde la posición actual del cursor"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Copiar la línea actual (o la región marcada) y guardarla en el cutbuffer"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Desechar la línea actual (o la región marcada)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Sangrar la línea actual (o las líneas marcadas)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Quitar sangrado de la línea actual (o las líneas marcadas)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Deshacer la última operación"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Rehacer la última operación deshecha"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Ir hacia atrás un carácter"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Ir hacia delante un carácter"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Ir hacia atrás una palabra"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Ir hacia delante una palabra"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Ir a la línea anterior"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Ir a la siguiente línea"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Ir al principio de la línea actual"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Ir al final de la línea actual"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Ir al bloque de texto anterior"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Ir al siguiente bloque de texto"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Ir al principio del párrafo; después, al del párrafo anterior"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Ir al final del párrafo; después, al del párrafo siguiente"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Ir a la primera línea del fichero"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Ir a la última línea del fichero"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Ir a la llave correspondiente"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Desplazar el texto una línea arriba sin mover el cursor textualmente"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Desplazar el texto una línea abajo sin mover el cursor textualmente"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar al búfer de fichero anterior"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Cambiar al siguiente búfer de fichero"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Insertar la próxima pulsación literalmente"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Insertar un carácter de tabulación en la posición del cursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Borrar el carácter bajo el cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Cortar hacia atrás desde cursor a principio de palabra"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Borrar hacia atrás desde el cursor hasta el principio de palabra"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Cortar desde cursor a principio de siguiente palabra"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
+"Borrar hacia delante desde el cursor hasta principio de siguiente palabra"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cortar desde el cursor hasta el final de línea"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justificar el párrafo actual"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justificar el fichero completo"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Contar el número de palabras, líneas y caracteres"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspender el editor (si la suspensión está activada)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Intenta completar la palabra actual"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Comentar/descomentar la línea actual (o las líneas marcadas)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Guardar fichero sin preguntar"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Seguir buscando hacia atrás"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Seguir buscando hacia delante"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Iniciar/parar grabación de macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Ejecutar la última macro grabada"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Cambiar la distinción mayús./minús. en la búsqueda"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Cambiar la dirección de búsqueda"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Cambiar el uso de expresiones regulares"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Recuperar la cadena previa de búsqueda/reemplazo"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Recuperar la siguiente cadena de búsqueda/reemplazo"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Conmutar el uso de formato DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Conmutar el uso de formato Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Conmutar el añadir texto"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Conmutar el prefijar texto"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Conmutar la creación de ficheros de respaldo"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Ejecutar una orden externa"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Conectar el búfer actual (o la región marcada) a la orden"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "No convertir desde el formato DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Conmutar el uso de nuevo búfer"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "¿Cerrar el búfer sin guardarlo?"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Salir del navegador de ficheros"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Ir al primer fichero de la lista"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Ir al último fichero de la lista"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Ir al fichero anterior en la lista"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Ir al siguiente fichero en la lista"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Ir a un directorio"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Invocar el corrector de sintaxis (si está disponible)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Ir al mensaje anterior del corrector"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Ir al siguiente mensaje del corrector"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ver ayuda"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Guardar"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Leer fich."
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justificar"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Buscar"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Ir a dir"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Cortar txt"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Pegar txt"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Posición"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ir a línea"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Rehacer"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marcar txt"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copiar txt"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Mayús/minú"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Exp. reg."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Ir atrás"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "No sustit."
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Más antiguo"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Más reciente"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "JustifTodo"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "A llave"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Guardar"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Buscar atrás"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Adelante"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Palabr ant"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Palabr sig"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Línea ant."
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Línea sig."
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Despl arri"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Despl abaj"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloque ant"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloque sig"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Ini de pár."
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fin de pár."
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pág. ant."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Pág. sig."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Pri. línea"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Últ. línea"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Fich ant"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fich sig"
 
-#: src/global.c:927
+#: src/global.c:930
 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:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Borrar"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Suprimir"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
 msgstr "Cortar izquierda"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr "Cortar derecha"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "CortHastFin"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Cont palab"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Literal"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspender"
 
 # 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:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Sangrado"
 
 # 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:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Quitar sangrado"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Líneas de comentarios"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completar"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Grabar"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Ejecutar macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Borrar texto"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Corrector"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Guardar"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ir a texto"
@@ -1183,61 +1182,61 @@ msgstr "Mens. sig."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Modo de ayuda"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Muestra constante de la posición del cursor"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Desplazamiento suave"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Desplazamiento a saltos (media pantalla)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajuste suave de líneas largas"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Muestra los blancos"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tecla de inicio inteligente"
 
 # En español se dice sangrar. Es un término tipográfico que se usa
 # desde hace mucho, pero que la gente olvida por influencia del inglés. sv
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Auto-sangrado"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Cortado desde el cursor hasta el final de línea"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajuste estricto de líneas largas"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de pulsaciones de tabulador a espacios"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Soporte para ratón"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numeración de líneas"
 
@@ -1616,19 +1615,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Error al escribir «%s»: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "La tecla no es válida en modo de visualización"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Esta función está desactivada en modo restringido"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "No hay ayuda disponible"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1637,7 +1636,7 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1646,7 +1645,7 @@ msgstr ""
 "\n"
 "No se ha escrito el búfer a %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1655,7 +1654,7 @@ msgstr ""
 "\n"
 "No se ha escrito el búfer: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1666,7 +1665,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1676,7 +1675,7 @@ msgstr ""
 "número de línea con un '+' delante del nombre del fichero.  También puede\n"
 "ponerse el número de columna a continuación de una coma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1685,287 +1684,299 @@ msgstr ""
 "Cuando el nombre de fichero es '-', nano lee datos de la entrada estándar.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opción\t\tOpción larga\t\tSignificado\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Habilitar una tecla de inicio inteligente"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Guardar respaldo de los ficheros existentes"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
 # The "unique" is unnecessary and confusing.  --  benno
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Directorio donde guardar ficheros de respaldo"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Usar negrita en lugar de texto inverso"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir tabulaciones a espacios al escribir"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 "Leer fichero dejándolo en un buffer diferente como comportamiento predefinido"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Usar ficheros de bloqueo (estilo vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Registrar y leer histórico de cadenas de búsqueda/reemplazo"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "No leer los ficheros nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Mostrar una barra de guía en esta columna"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Arreglar el problema de confusión del teclado numérico"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "No añadir avances de línea al final de los ficheros"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "No añadir nueva línea automática [comportamiento predefinido]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Eliminar espacios finales cuando se aplique ajuste estricto"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No convertir los ficheros desde el formato DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Usar una línea más para edición"
-
 # The original is poor.  --  benno
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Guardar y restaurar la posición del cursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Expresión regular para coincidir con cita"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Modo restringido"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Desplazarse línea a línea en lugar de media pantalla"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <número>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<número>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Fijar el ancho de tab a <número> columnas"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Borrado rápido de la barra de estado"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Mostrar información sobre la versión y salir"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detectar límite entre palabras con más exactitud"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <cadena>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<cadena>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Qué otros caracteres son partes de palabra"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nombre>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nombre>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definición de sintaxis a usar para coloreado"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Permitir que Bsp y Del borren una región demarcada"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Al hacer ajuste de línea suave, hacerlo en espacio en blanco"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ajuste estricto automático de líneas largas"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Mostrar constantemente la posición del cursor"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arreglar el problema de confusión Retroceso/Suprimir"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Mantener vacía la línea bajo la barra de título"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Garantizar que el texto termina con nueva línea"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Mostrar cursor en el navegador de ficheros y en el texto de ayuda"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Mostrar este texto de ayuda y salir"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Sangrar automáticamente nuevas líneas"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Desplazamiento por medias pantallas, no por línea"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Cortar desde el cursor al final de línea"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Mostrar los números de línea delante del texto"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Habilitar el uso del ratón"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "No leer el fichero (sólo escribirlo)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Establecer el directorio de operación"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservar teclas XON (^Q) y XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <número>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<número>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Fijar el límite de ajuste en <número> columnas"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Establecer anchura para ajuste estricto y justificación"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <programa>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<programa>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Habilitar un corrector ortográfico alternativo"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Guardar automáticamente al salir, sin preguntar"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Guardar fichero en formato Unix por omisión"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Modo de visualización (sólo lectura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "No ajustar rígidamente líneas largas"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "No ajustar rígidamente líneas largas [comportamiento predefinido]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "No mostrar las dos líneas de ayuda"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Configurar Ctrl+derecha para que se detenga al final de las palabras"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 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:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Habilitar ajuste de línea suave"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versión %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s los colaboradores de nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Correo: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1974,276 +1985,295 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Sin nombre de fichero"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "¿Guardar el búfer modificado?  (Responder \"No\" DESCARTARÁ los cambios.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Se está leyendo la entrada estándar; teclee ^D o ^D^D para acabar.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "No se ha podido abrir stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "¡Lo sentimos! ¡Nano se ha estrellado!  Código: %d.  Por favor, envíe informe "
 "de error.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Use «fg» para volver a nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "La suspensión no está activada"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "tecla sin asociar"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tecla no asociable: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "tecla sin asociar: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Tecla no asociable: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tecla sin asociar: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tecla sin asociar: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "La columna de guía «%s» no es válida"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "La opción %s se ignora; es lo predefinido\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "El tamaño «%s» de tabulador no es válido"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "El tamaño «%s» de llenado no es válido"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Teclea «%s -h» para la lista de opciones.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Expresión regular con comillas incorrectas «%s»: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Número de línea o columna no válido"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Errores en '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Bienvenido a nano.  Para obtener ayuda básica, pulse Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "No"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Todas"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Error en %s en la línea %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex «%s» incorrecta: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Falta el nombre para la sintaxis"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Comillas sin cerrar en el nombre de la sintaxis"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxis «none» está reservada"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintaxis «default» no admite extensiones"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Falta el nombre de la combinación"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "El nombre de la combinación es demasiado corto"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 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:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "El nombre de combinación «%s» no es válido"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Debe especificar una función a la cual vincular la tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Debe especificar un menú (o «all») en el cual vincular/desvincular la tecla"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "El «%s» no es un nombre de función"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "El «%s» no es un nombre de menú"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La función «%s» no existe en el menú «%s»"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "La combinación «%s» no puede ser revinculada"
+msgid "Keystroke %s may not be rebound"
+msgstr "La combinación %s no puede ser revinculada"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Error al expandir «%s»: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Color «%s» no reconocido"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "El color de fondo no puede ser brillante"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "La orden '%s' requiere una orden 'syntax' que lo preceda"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Falta un nombre de color"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Falta una cadena regex detrás de la orden '%s'"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Cadena regex vacía"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requiere su «end=» correspondiente"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "La sintaxis «default» no admite regex '%s'"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Falta un argumento después de '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Al argumento «%s» le falta una  \" de cierre"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "No hay ninguna tecla vinculada a la función '%s' en el menú '%s'.  "
 "Terminando.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2251,58 +2281,58 @@ msgstr ""
 "Si es necesario, use nano con la opción -I para ajustar su configuración "
 "nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "No se pudo encontrar la sintaxis «%s» para extender"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxis «%s» no tiene órdenes de color"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "No se admite la orden «%s» en el fichero incluido"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Falta una opción"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción «%s» desconocida"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "No es posible desactivar la opción «%s»"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "La opción «%s» precisa un argumento"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "El argumento no es una cadena multibyte válida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Se precisan caracteres que no sean blancos"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "No se encontró el directorio del usuario.  ¡Ay!"
 
@@ -2364,242 +2394,250 @@ msgstr "No es una llave"
 msgid "No matching bracket"
 msgstr "No hay una llave correspondiente"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marca establecida"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marca borrada"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Error al invocar «%s»"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Este tipo de fichero no admite comentarios"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "No puede haber comentarios pasado el fin de fichero"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nada para deshacer en el búfer"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "adición de texto"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "añadido"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "salto de línea"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "eliminación de texto"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "borrado"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "unión de líneas"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "reemplazamiento de texto"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "reemplazamiento"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "borrado"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "corte de texto"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "corte"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "pegado de texto"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "pegado"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "inserción de texto"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "inserción"
 
 # 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/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "sangrado"
 
 # 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/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "quitar sangrado"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "comentar"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "descomentar"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Acción deshecha (%s)"
+msgid "Undid %s"
+msgstr "Deshecho %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nada para rehacer"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Acción rehecha (%s)"
+msgid "Redid %s"
+msgstr "Rehecho %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "No se pudo crear una tubería («pipe»)"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtrado"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "No se ha podido abrir la tubería: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "El marcador de cita «%s» no es válido: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "justificación"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Selección justificada"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Fichero justificado"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Ahora se puede desjustificar."
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Párrafo justificado"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Palabra no encontrable: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Editar un reemplazamiento"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Palabra sig..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando una lista de palabras mal escritas.  Espere, por favor..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "No se pudo obtener el tamaño del búfer de la tubería («pipe»)"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Error al invocar «spell»"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Error al invocar «sort -f»"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Error al invocar «uniq»"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Comprobación de ortografía fallida: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Comprobación de ortografía fallida: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:3037
+#: src/text.c:2801
 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:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "¿Guardar el búfer modificado antes de invocar el corrector?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Invocando el corrector de sintaxis.  Espere, por favor..."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Se han recibido cero líneas analizables de la orden «%s»"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Este mensaje es para el fichero no abierto %s; ¿abrirlo en un nuevo búfer?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "No hay mensajes para este fichero"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Este es el primer mensaje"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Este es el último mensaje"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sPalabras: %zu Líneas: %zd Caracteres: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "En la selección: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "No hay fragmentos de palabras"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "No hay más coincidencias"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "No hay coincidencias"
 
 # ¡memoria insuficiente! sv
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "¡Nano se ha quedado sin memoria!\n"
 
@@ -2625,79 +2663,125 @@ msgstr "Demasiados errores de stdin\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Secuencia desconocida"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrada de Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Analizando --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Restringido"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Se han suprimido avisos adicionales"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "línea %zd/%zd (%d%%), col %zu/%zu (%d%%), car %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "los traductores y el TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera de quien nos hayamos olvidado..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Gracias por usar nano."
 
+#~ msgid "Uncut Text"
+#~ msgstr "Pegar txt"
+
+#~ msgid "Unjustify"
+#~ msgstr "Desjustif."
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Pegar el cutbuffer en la línea actual"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Desplazamiento suave"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "No añadir avances de línea al final de los ficheros"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Usar una línea más para edición"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Fijar el límite de ajuste en <número> columnas"
+
+#~ msgid "text add"
+#~ msgstr "adición de texto"
+
+#~ msgid "text delete"
+#~ msgstr "eliminación de texto"
+
+#~ msgid "text replace"
+#~ msgstr "reemplazamiento de texto"
+
+#~ msgid "text cut"
+#~ msgstr "corte de texto"
+
+#~ msgid "text uncut"
+#~ msgstr "pegado de texto"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "El marcador de cita «%s» no es válido: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Ahora se puede desjustificar."
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tecla no válida en modo no-multibúfer"
 
diff --git a/po/eu.po b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -29,9 +29,9 @@ msgstr "Ezin da direktorioan gora egin"
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
@@ -46,9 +46,9 @@ msgstr "Ezin da %staz kanpo idatzi"
 msgid "Can't move up a directory"
 msgstr "Ezin da direktorioan gora egin"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
@@ -94,17 +94,17 @@ msgstr "Hau da kointzidentzia bakarra"
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Bikoiztutako %s sintaxi izena"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -197,7 +197,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Bufer berria"
 
@@ -303,859 +303,852 @@ msgstr "Txertatzeko fitxategia [%s-tik] "
 msgid "File to insert [from %s]"
 msgstr "Txertatzeko fitxategia [%s-tik] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Ezarri eragiketa direktorioa"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Ezin da direktorioan gora egin"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Babes-kopia fitxategi gehiegi?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Lerro %lu idatzia"
 msgstr[1] "%lu lerro idatziak"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr "[DOS formatua]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr "[Mac formatua]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Babeskopia]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Gehitu aukeraketa fitxategiaren hasieran"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Gehitu aukeraketa fitxategian"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun fitxategiaren izena"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Gehituko zaion fitxategiaren izena "
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 #, fuzzy
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(gehiago)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Irten"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Itxi"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "Ezmoztu testua"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-msgstr "Justifikazioa ezeztatu"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Atzerantza bilatu"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 #, fuzzy
 msgid "Go to lefthand column"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:556
+#: src/global.c:550
 #, fuzzy
 msgid "Go to righthand column"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Cutbufferekoa uneko lerroan txertatu"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Kurtsorearen posisioa erakutsi"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Ordezkatu kate bat edo expresio erregular bat"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Markatu testua kurtsorearen uneko posizioan"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Uneko lerroa kopiatu eta cutbufferean gorde"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Koska kendu uneko lerroari"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:577
 #, fuzzy
 msgid "Go back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: src/global.c:584
+#: src/global.c:578
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: src/global.c:585
+#: src/global.c:579
 #, fuzzy
 msgid "Go back one word"
 msgstr "Mugitu hitz bat atzeruntz"
 
-#: src/global.c:586
+#: src/global.c:580
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Mugitu hitz bat atzera"
 
-#: src/global.c:587
+#: src/global.c:581
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:588
+#: src/global.c:582
 #, fuzzy
 msgid "Go to next line"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:589
+#: src/global.c:583
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: src/global.c:590
+#: src/global.c:584
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: src/global.c:591
+#: src/global.c:585
 #, fuzzy
 msgid "Go to previous block of text"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:589
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Mugitu uneko parrafoaren hasierara"
 
-#: src/global.c:597
+#: src/global.c:591
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Mugitu uneko parrafoaren amaierara"
 
-#: src/global.c:599
+#: src/global.c:593
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Mugitu fitxategiaren lehen lerrora"
 
-#: src/global.c:600
+#: src/global.c:594
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Mugitu fitxategiaren azken lerrora"
 
-#: src/global.c:602
+#: src/global.c:596
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Korritu gora lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Korritu behera lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Aldatu aurreko fitxategi buffer-era"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Aldatu hurrengo fitxategi buffer-era"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Hurrengo tekla-sakatzea literalki sartu"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/global.c:616
+#: src/global.c:610
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posizioan txertatu"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Kurtsorearen azpiko karaterea ezabatu"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtsorearen ezkerraldeko karaterea ezabatu"
 
-#: src/global.c:622
-#, fuzzy
-msgid "Cut backward from cursor to word start"
-msgstr "Moztu kurtsoretik lerro amaierara"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr ""
 
-#: src/global.c:624
-#, fuzzy
-msgid "Cut forward from cursor to next word start"
-msgstr "Moztu kurtsoretik lerro amaierara"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Moztu kurtsoretik posiziotik lerro amaierara arte"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Uneko parrafoa justifikatu"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justifikatu lerro osoa"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Zenbatu hitz, lerro eta karaktere kopurua"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Atzerantza bilatu"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr ""
 
-#: src/global.c:655
+#: src/global.c:649
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Mayuskula/minuskulaz egindako bilaketa"
 
-#: src/global.c:657
+#: src/global.c:651
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: src/global.c:659
+#: src/global.c:653
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: src/global.c:662
+#: src/global.c:656
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:664
+#: src/global.c:658
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:667
+#: src/global.c:661
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dos formatoan fitxategia idazten"
 
-#: src/global.c:668
+#: src/global.c:662
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Idatzi fitxategia Mac formatuan"
 
-#: src/global.c:669
+#: src/global.c:663
 #, fuzzy
 msgid "Toggle appending"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:671
+#: src/global.c:665
 #, fuzzy
 msgid "Toggle backing up of the original file"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Exekutatu kanpo-komandoa"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuko fitxategiak"
 
-#: src/global.c:678
+#: src/global.c:672
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Fitxategi nabigatzailera joan"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Irten fitxategi nabigatzailetik"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:686
+#: src/global.c:680
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:687
+#: src/global.c:681
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Joan direktorio honetara"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:693
+#: src/global.c:687
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Mugitu hurrengo lerrora"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Laguntza begiratu"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Bertan behera utzi"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "Gorde"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Artxiboa irakurri"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justifikatu"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ordezkatu"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Joan direktorio honetara"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Textua moztu"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Textua moztu"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Joan lerro hontara"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "May/Min"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Atzeruntza"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Ez ordezkatu"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Justifikatu"
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ez da hori giltza"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Bilatu"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "Hurrengo orrialdea"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Aurrean"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Hurrengo hitza"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Aurreko lerroa"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Hurrengo lerroa"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Aurreko hitza"
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Hurrengo hitza"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Par hasi"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Par amai"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Aurreko orrialdea"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Hurrengo orrialdea"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Lehen lerroa"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Azken lerroa"
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Atzera tekla"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Ezabatu"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Textua moztu"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:963
+#: src/global.c:966
 #, fuzzy
 msgid "Verbatim"
 msgstr "Sarrera literala"
 
-#: src/global.c:969
+#: src/global.c:974
 #, fuzzy
 msgid "Suspend"
 msgstr "Eseki"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Koskatu testua"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "Hurrengo lerroa"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Textua markatu"
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "Joan lerro hontara"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Joan testu hontara"
@@ -1239,61 +1232,61 @@ msgstr "Hurrengo lerroa"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Korritze leuna"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr ""
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1416
+#: src/global.c:1426
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1652,21 +1645,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Errorea %s idazten: %s"
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Tekla baliogabea ikuskatze moduan"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Ezin da maila nagusia era murriztuan bisitatu"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1675,7 +1668,7 @@ msgstr ""
 "\n"
 "Bufferra hemen idatzia: %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1684,7 +1677,7 @@ msgstr ""
 "\n"
 "Bufferra ez da %s-(e)n idatzi: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1693,7 +1686,7 @@ msgstr ""
 "\n"
 "Bufferra ez da idatzi: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1704,308 +1697,320 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Aukera\t\tGNU aukera luzea\t\tEsanahia\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Gaitu 'smart home' tekla"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Babeskopia fitxategiak idazteko direktorioa"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Erabili lodia alderantzizko testua beharrean"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabuladoreak zuriuneetara"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Idatzi eta irakurri bilaketa/aldaketa kateen historia"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Ez begiratu nanorc fitxategietan"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Konpondu zenbakizko teklatu nahaste arazoak"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuko fitxategiak"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Erabili lerro bat edo gehiago editatzeko"
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <str>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 #, fuzzy
 msgid "Regular expression to match quoting"
 msgstr "Expresio erregularra"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mugatutako modua"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Ezarri fitxa baten zabalera #cols-era"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Egin egoera-barra garbiketa azkarra"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Bertsioaren informazioa inprimatu eta irten"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Aurkitu hitz amaierak zehatzago aurkitu"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "-X <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "--wordchars=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Erabiltzeko sintaxi definizioa"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Automatikoki indentatu lerro berriak"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Erakutsi beti kurtsorearen posizioa"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Konpondu atzera tekla/ezabatu nahaste arazoak"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 #, fuzzy
 msgid "Show this help text and exit"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Automatikoki indentatu lerro berriak"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Gaitu xaguaren erabilera"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Ezarri eragiketa direktorioa"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Mantendu XON (^Q) eta XOFF (^S) teklak"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-#, fuzzy
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Ezarri zutabe-tab baten zabalera #cols-i"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Gahitu zuzentzaile alternatiboa"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Irteterakoan automatikoki gorde, ez galdetu"
 
-#: src/nano.c:886
+#: src/nano.c:892
 #, fuzzy
 msgid "Save a file by default in Unix format"
 msgstr "Idatzi fitxategia DOS formatuan"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Ikuskatze modua (irakurri bakarrik)"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Ez erakutsi bi laguntza lerroak"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Gaitu esekitzea"
 
-#: src/nano.c:899
+#: src/nano.c:905
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr "E-posta: nano@nano-editor.org\tWebgunea: http://www.nano-editor.org"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2014,335 +2019,354 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, fuzzy, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "\"%s\" regex okerra: %s"
+
+#: src/nano.c:2648 src/search.c:789
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Bb"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Ee"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Dd"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Bai"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ez"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Guztiak"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Errorea %s-n %lu lerroan: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sintaxia erreserbaturik dago"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 #, fuzzy
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, fuzzy, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 #, fuzzy
 msgid "Empty regex string"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "\"%s\" bandera ezezaguna"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ezin da \"%s\" bandera kendu"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
@@ -2405,246 +2429,256 @@ msgstr "Ez da hori giltza"
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marka aukeratua"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Markatu ez hautatua"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr ""
 
-#: src/text.c:759 src/text.c:939
+#: src/text.c:567 src/text.c:748
 #, fuzzy
-msgid "text delete"
-msgstr "Hurrengo fitxategia"
+msgid "deletion"
+msgstr "Aukeraketan:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr ""
 
-#: src/text.c:788 src/text.c:967
+#: src/text.c:596 src/text.c:776
 #, fuzzy
-msgid "text replace"
-msgstr "(aldatzeko)"
+msgid "replacement"
+msgstr "Ordezkoa editatu"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr ""
 
-#: src/text.c:819 src/text.c:999
+#: src/text.c:628 src/text.c:808
 #, fuzzy
-msgid "text insert"
-msgstr "Hurrengo lerroa"
+msgid "insertion"
+msgstr "Helbidea"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Auto indentatu"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Auto indentatu"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr ""
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr ""
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Ezin ~/.nanorc artxiboa ireki, %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "%s aipamen kate okerra: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Orain ez-justifikatu dezakezu!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Justifikatu lerro osoa"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Uneko parrafoa justifikatu"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "Hurrengo hitza"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Errorea \"spell\"-i deitzen"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Errorea \"sort -f\"-i deitzen"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:3037
+#: src/text.c:2801
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 #, fuzzy
 msgid "At first message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3329
+#: src/text.c:3093
 #, fuzzy
 msgid "At last message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Sarrera literala"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Ez dago giltz egokirik"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano: memoriatik kanpo!"
@@ -2671,77 +2705,82 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, fuzzy, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode sarrera"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Aldatua"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Ikusi"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Mugatutako modua"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr ""
 "%ld/%ld (%d%%) lerroa, %lu/%lu (%d%%) zutabea, %lu/%lu\t (%d%%) karakterea"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Mila esker nano erabiltzeagatik!"
 
@@ -2784,9 +2823,18 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Move to the next screen"
 #~ msgstr "Hurrengo pantailara mugitu"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Cutbufferekoa uneko lerroan txertatu"
+
 #~ msgid "Repeat last search"
 #~ msgstr "Errepikatu azken bilaketa"
 
+#~ msgid "UnJustify"
+#~ msgstr "Justifikazioa ezeztatu"
+
+#~ msgid "UnCut Text"
+#~ msgstr "Ezmoztu testua"
+
 #~ msgid "Find Other Bracket"
 #~ msgstr "Beste giltz bat bilatu"
 
@@ -2796,6 +2844,9 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Erabili lerro bat edo gehiago editatzeko"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Korritze leuna"
+
 #~ msgid "Backup files"
 #~ msgstr "Babeskopia fitxategiak"
 
@@ -2823,6 +2874,9 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Enable multiple file buffers"
 #~ msgstr "Gaitu fitxategi buffer ugari"
 
+#~ msgid "Use one more line for editing"
+#~ msgstr "Erabili lerro bat edo gehiago editatzeko"
+
 #~ msgid "Quoting string"
 #~ msgstr "Aipamen katea"
 
@@ -2832,6 +2886,10 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Don't follow symbolic links, overwrite"
 #~ msgstr "Ez jarraitu esteka sinbolikoak, gainidatzi"
 
+#, fuzzy
+#~ msgid "Set wrapping point at column #cols"
+#~ msgstr "Ezarri zutabe-tab baten zabalera #cols-i"
+
 #~ msgid "(ignored, for Pico compatibility)"
 #~ msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
 
@@ -2878,6 +2936,12 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Could not pipe"
 #~ msgstr "Ezin da hoditik pasa"
 
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "%s aipamen kate okerra: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Orain ez-justifikatu dezakezu!"
+
 #~ msgid "File:"
 #~ msgstr "Fitxategia:"
 
@@ -2939,9 +3003,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "Ezin da \"%s\" ireki: %s"
 
-#~ msgid "Direction"
-#~ msgstr "Helbidea"
-
 #~ msgid "Insert a tab character"
 #~ msgstr "Tab karaktere bat txertatu"
 
diff --git a/po/fi.po b/po/fi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-09-13 21:11+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -34,9 +34,9 @@ msgstr "Hakemiston avaaminen ei onnistu: %s"
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -51,9 +51,9 @@ msgstr "Hakemiston %s ulkopuolelle ei voi siirtyä"
 msgid "Can't move up a directory"
 msgstr "Ylähakemistoon siirtyminen epäonnistui"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa tiedostoa %s: %s"
@@ -99,17 +99,17 @@ msgstr "Tämä on ainoa esiintymä"
 msgid "No current search pattern"
 msgstr "Ei nykyistä hakumallia"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Tuntematon syntaksin nimi: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() epäonnistui: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) epäonnistui: %s"
@@ -205,7 +205,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Uusi puskuri"
 
@@ -313,802 +313,801 @@ msgstr "Lisättävä tiedosto [hakemistosta %s]"
 msgid "File to insert [from %s]"
 msgstr "Lisättävä tiedosto [hakemistosta %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Virheellinen toimintahakemisto\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Varmuuskopio epäonnistui, jatketaanko tallentamista? (Vastaa E jos olet "
 "epävarma.) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Virheellinen varmuuskopiohakemisto\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Hakemiston %s ulkopuolelle ei voi kirjoittaa"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoa %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Liian monta varmuuskopiotiedostoa?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Virhe kirjoitettaessa tilapäistiedostoa: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Virhe kirjoitettaessa tiedostoa %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Kirjoitettu %zu rivi"
 msgstr[1] "Kirjoitettu %zu riviä"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-muoto]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-muoto]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Varmuuskopio]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Lisää valinta tiedoston alkuun"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Lisää valinta tiedoston loppuun"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Kirjoita valinta tiedostoon"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Tiedosto, jonka alkuun kirjoitetaan"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Tiedosto, jonka loppuun kirjoitetaan"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Kirjoitettava tiedosto"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Liian pieni"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Tiedosto on olemassa – ei voi korvata"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Tallennetaanko tiedosto ERI NIMELLÄ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Tiedosto ”%s” on olemassa, KORVATAANKO? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Levyllä oleva tiedosto on muuttunut"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Muu ohjelma on muuttanut tiedostoa, jatketaanko tallentamista? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Lopeta"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Sulje"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Epäleikkaa"
-
-#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Epätasaa"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Näytä tämä ohjeteksti"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Sulje nykyinen puskuri / Poistu nanosta"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Kirjoita nykyinen puskuri (tai merkitty alue) levylle"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Lisää toinen tiedosto nykyiseen (tai uuteen) puskuriin"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Etsi merkkijonoa"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Etsi merkkijonoa"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Päivitä tiedostolista"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Siirry sarake vasemmalle"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Siirry sarake oikealle"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Siirry tämän sarakkeen ensimmäiselle riville"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Siirry tämän sarakkeen viimeiselle riville"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Siirry ruutu ylöspäin"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Siirry ruutu alaspäin"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Leikkaa nykyinen rivi ja varastoi se leikepuskuriin"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Liitä leikepuskurista nykyiselle riville"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Lisää sarkain kohdistimen kohdalle"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Korvaa merkkijono tai säännöllinen lauseke"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Siirry annetulle riville ja sarakkeeseen"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Merkitse tekstiä kohdistimesta alkaen"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Kopioi nykyinen rivi (tai merkitty alue) ja varastoi se leikepuskuriin"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Sisennä nykyinen rivi (tai merkityt rivit)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Sisennä nykyinen rivi (tai merkityt rivit)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Epäsisennä nykyinen rivi (tai merkityt rivit)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Peru viimeisin toimenpide"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Tee uudelleen viimeksi peruttu toimenpide"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Siirry yksi sana taaksepäin"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Siirry yksi sana eteenpäin"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Siirry edelliselle riville"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Siirry seuraavalle riville"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Siirry edelliseen tekstilohkoon"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Siirry seuraavaan tekstilohkoon"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Siirry kappaleen alkuun; sitten seuraavan kappaleen"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Siirry aivan kappaleen lopun perään; sitten seuraavan kappaleen"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Siirry vastaavalle sulkeelle"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Vieritä rivi ylöspäin siirtämättä kohdistinta tekstissä"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Vieritä rivi alaspäin siirtämättä kohdistinta tekstissä"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Vaihda edelliseen tiedostopuskuriin"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Vaihda seuraavaan tiedostopuskuriin"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Lisää seuraava näppäily sellaisenaan"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Lisää sarkain kohdistimen kohdalle"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista merkki kohdistimen vasemmalta puolelta"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Leikkaa taaksepäin kohdistimesta sanan alkuun"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Leikkaa eteenpäin kohdistimesta seuraavan sanan alkuun"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Leikkaa kohdistimesta tiedoston loppuun"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Tasaa koko tiedosto"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Laske sanojen, rivien ja merkkien määrä"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Virkistä (piirrä uudelleen) nykyinen ruutu"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Hyllytä editori (jos hyllytys on käytössä)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Yritä täydentää nykyinen sana"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Kommentoi/epäkommentoi nykyinen riviä (tai merkityt rivit)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Tallenna tiedosto kysymättä"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Hae seuraava esiintymä taaksepäin"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Hae seuraava esiintymä eteenpäin"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Käynnistä/Pysäytä makron tallennus"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Suorita viimeksi tallennettu makro"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Vaihda haun merkkikoon huomiointi käyttöön tai pois"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Vaihda haun suunta"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Vaihda säännölliset lausekkeet käyttöön tai pois"
 
-#: src/global.c:662
+#: src/global.c:656
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Kutsu takaisin edellinen haettu/korvattu merkkijono"
 
-#: src/global.c:664
+#: src/global.c:658
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Kutsu takaisin seuraava haettu/korvattu merkkijono"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Vaihda DOS-muoto käyttöön tai pois"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Vaihda Mac-muoto käyttöön tai pois"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Vaihda liittäminen loppuun käyttöön tai pois"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Vaihda liittäminen alkuun käyttöön tai pois"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi käyttöön tai pois"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Suorita ulkoinen komento"
 
-#: src/global.c:674
+#: src/global.c:668
 #, fuzzy
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Kirjoita nykyinen puskuri (tai merkitty alue) levylle"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Älä muunna DOS/Mac-muodosta"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Vaihda uuden puskurin käyttö päälle tai pois"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Sulje puskuri tallentamatta sitä"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Poistu tiedostoselaimesta"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Siirry luettelon ensimmäiseen tiedostoon"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Siirry luettelon viimeiseen tiedostoon"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Siirry luettelon edelliseen tiedostoon"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Siirry luettelon seuraavaan tiedostoon"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Käynnistä esikatselu (jos saatavilla)"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Siirry edelliseen esikatseluun"
 
-#: src/global.c:693
+#: src/global.c:687
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Siirry seuraavaan esikatseluun"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ohjeet"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Kirjoita"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Lue tied."
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Tasaa"
 
 #  "Päivitä"?
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Virkistä"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Hae"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Korvaa"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Siirry hak."
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Leikkaa"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Kopioi"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Oikoluku"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Sijainti"
 
 #  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:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Rivinumero"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Peru"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Merkitse"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopioi"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Kirj.koko"
 
 #  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Säännöke"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Taaksepäin"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Älä korvaa"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "KokoTas."
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Sulkeeseen"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Tallenna"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Hae taaksepäin"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Edellinen"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Ed. sana"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Seur. sana"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "End"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Ed. rivi"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Seur. rivi"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Vieritä ylös"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Vieritä alas"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Edell. lohko"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Seur. lohko"
 
 # "Par" on "paragraph"
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Kapp. alku"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Kapp. loppu"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Ed. sivu"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Seur. sivu"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Ens. rivi"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Viim. rivi"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Ed. tied."
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Seur. tied."
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Askelpalautin"
 
 # Oletetaan että tämä on näppäimen nimi tässä yhteydessä.
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Leikk. vas."
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Leikk. oik."
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "LeikkLoppuun"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Sanamäärä"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Merkintarkka"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Hyllytä"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Sisennä"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Epäsisennä"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "Seur. rivi"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Merkitse"
@@ -1116,11 +1115,15 @@ msgstr "Merkitse"
 #  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:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "Esikatseluun"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Tallenna"
+
 #  Tämä on "Etsi"-valikossa.
 #  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
 #  Huomaa myös "Go To Line Help Text".
@@ -1208,60 +1211,61 @@ msgstr "Seur. esikats."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Jatkuva kohdistimen sijainnin näyttö"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Pehmeä vieritys"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Vieritä rivi kerrallaan puoliruudun sijaan"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ylipitkien rivien pehmeä rivitys"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Tyhjemerkkien näyttö"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Värillinen syntaksin korostus"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Älykäs Home-näppäin"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Ylipitkien rivien kova rivitys"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Näppäiltyjen sarkainten muunnos välilyönneiksi"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Hiirituki"
 
 # Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Hyllytys"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Rivinumerointi"
 
@@ -1631,19 +1635,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Virhe kirjoitettaessa tiedostoa %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Näppäin on virheellinen katselutilassa"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Tämä toiminto on poissa käytöstä rajoitetussa tilassa"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Ohjetta ei ole saatavilla"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1652,7 +1656,7 @@ msgstr ""
 "\n"
 "Puskuri kirjoitettu tiedostoon %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1661,7 +1665,7 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1670,7 +1674,7 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1681,14 +1685,14 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1697,286 +1701,301 @@ msgstr ""
 "Kun tiedostonimi on ”-”, nano lukee datan vakiosyötteestä.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valitsin\tPitkä GNU-valitsin\tMerkitys\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Ota käyttöön älykäs Home-näppäin"
 
 #  "tallennettaessa"?
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Tallenna varmuuskopiot olemassa olevista tiedostoista"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <hak>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<hak>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Hakemisto uniikkien varmuuskopiotiedostojen tallentamiseen"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Käytä tekstin lihavointia käänteisten värien sijaan"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Muunna näppäillyt sarkaimet välilyönneiksi"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Lue tiedosto uuteen puskuriin oletusarvoisesti"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Käytä (vim-tyylisiä) lukkotiedostoja"
 
-#: src/nano.c:800
+#: src/nano.c:796
 #, fuzzy
 msgid "Log & read search/replace string history"
 msgstr "Muista viimeksi etsityt/korvatut merkkijonot"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Älä käytä nanorc-tiedostoja"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Siirry tämän sarakkeen ensimmäiselle riville"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Korjaa numeronäppäimistön sekaantumisongelma"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Älä lisää rivinvaihtoja tiedostojen loppuun"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Älä muunna tiedostoja DOS/Mac-muodosta"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Käytä yhtä lisäriviä muokkaukseen"
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Kirjaa lokiin ja lue kohdistinkoordinaatin sijainti"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <säänn.l.>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<mjono>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Rajoitettu tila"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Vieritä rivi kerrallaan puoliruudun sijaan"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#saraketta>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#saraketta>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Aseta sarkaimen leveydeksi #cols saraketta"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Tyhjennä tilarivi pikaisesti"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Näytä versiotiedot ja lopeta"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Havaitse sanarajat tarkemmin"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <mjono>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<mjono>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Mitkä muut merkit ovat sanan osia"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nimi>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nimi>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Väritykseen käytettävä syntaksimääritys"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Älä kovarivitä pitkiä rivejä"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Näytä kohdistimen sijainti jatkuvasti"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Korjaa Backspace/Delete-näppäinten sekaantumisongelma"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Näytä kohdistin tiedostoselaimessa"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Näytä tämä ohjeteksti ja poistu"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Sisennä uudet rivit automaattisesti"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Leikkaa kohdistimesta rivin loppuun"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Näytä rivinumerot tekstin edessä"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Ota hiiri käyttöön"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Älä lue tiedostoa (kirjoita pelkästään)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <hak>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<hak>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Aseta toimintahakemisto"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Salli XON (^Q)- ja XOFF (^S) -näppäimet"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#sarakkeet>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sarakkeet>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Aseta kova rivityskohta sarakkeeseen #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <ohjelma>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<ohjelma>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Käytä vaihtoehtoista oikolukuohjelmaa"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Tallenna tiedosto kysymättä poistuttaessa"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Tallenna tiedosto oletusarvoisesti Unix-muodossa"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Katselutila (vain luku)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Älä kovarivitä pitkiä rivejä"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Älä näytä kahta ohjeriviä"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Ota hyllytys käyttöön"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versio %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " © 2014–%s nanon tekijät\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Sähköposti: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1985,333 +2004,354 @@ msgstr ""
 "\n"
 " Käännetty valitsimilla:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Ei tiedostonimeä"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Tallennetaanko muutettu puskuri? (Vastaus ”Ei” HÄVITTÄÄ muutokset.)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Valitettavasti näppäimistön avaaminen uudelleen vakiosyötteeksi epäonnistui\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa nanoon komennolla ”fg”.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Hyllytys ei ole käytössä"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Sitomaton näppäin"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Ei-sidottava näppäin: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Sitomaton näppäin: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Ei-sidottava näppäin: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Sitomaton näppäin: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Sitomaton näppäin: %c"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Näppäimen nimi %s ei kelpaa"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#  puuttuu tai liian iso tai liian pieni
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Pyydetty sarkaimen koko ”%s” ei kelpaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pyydetty täyttöpituus ”%s” ei kelpaa"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Komento ”%s -h” näyttää käytettävissä olevat valitsimet.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Säännöllinen lauseke ”%s” ei kelpaa: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Tervetuloa nanoon. Perusohjeen näkee näppäilemällä Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "KkYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "EeNn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "aA"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ei"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Kaikki"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Virhe tiedostossa %s rivillä %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentti ”%s” sisältää parittoman \"-merkin"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Säännöllisten lausekkeiden on alettava ja loputtava \"-merkillä"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Säännöllinen lauseke ”%s” ei kelpaa: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Puuttuva syntaksin nimi"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Pariton lainausmerkki syntaksin nimessä"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "”none”-syntaksi on varattu"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "”default”-syntaksi ei hyväksy laajennoksia"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Puuttuva näppäimen nimi"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Näppäimen nimi on liian lyhyt"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Näppäinten nimien on alettava merkillä ”^”, ”M” tai ”F”"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Näppäimen nimi %s ei kelpaa"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "On määriteltävä toiminto, johon näppäin sidotaan"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "On määriteltävä valikko (tai ”all”), johon/josta näppäin sidotaan/irrotetaan"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Nimen ”%s” kytkeminen toimintoon ei onnistu"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nimen ”%s” kytkeminen valikkoon ei onnistu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Valikossa ”%2$s” ei ole toimintoa”%1$s”"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Valitettavasti näppäilyä ”%s” ei voi uudelleensitoa"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Virhe lavennettaessa valitsinta %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Väriä ”%s” ei ymmärretty"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Taustaväri ei voi olla kirkas"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "”%s”-komennon perästä puuttuu säännöllinen lauseke"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Tyhjä säännöllinen lauseke"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "”start=” vaatii vastaavan ”end=”:n"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "”default”-syntaksi ei saa ottaa laajennoksia"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, fuzzy, c-format
 msgid "Missing argument after '%s'"
 msgstr "Puuttuva esikatselukomento"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argumentti ”%s” sisältää parittoman \"-merkin"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Käytä tarvittaessa nanoa valitsimella -I nanorc:n asetusten säätämiseksi.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Laajennettavan syntaksin ”%s” löytäminen epäonnistui"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa ”%s” ei ole värikomentoja"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komentoa ”%s” ei sallita sisällytetyssä tiedostossa"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa ”%s” ei ymmärretty"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Tuntematon valitsin ”%s”"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Valitsinta ”%s” ei voi kumota"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valitsin ”%s” vaatii argumentin"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argumentti ei ole kelvollinen monitavumerkkijono"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Kaksi yksisarakkeista merkkiä vaaditaan"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kotihakemisto on hukassa! Vää!"
 
@@ -2377,243 +2417,256 @@ msgstr "Ei ole sulje"
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
-#: src/text.c:63
+#: src/text.c:57
 #, fuzzy
 msgid "Mark Set"
 msgstr "Merkintä alkoi"
 
-#: src/text.c:67
+#: src/text.c:61
 #, fuzzy
 msgid "Mark Unset"
 msgstr "Merkintä loppui"
 
-#: src/text.c:77
+#: src/text.c:71
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta ”%s”"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Tämän tiedostotyypin kommentointi ei onnistu"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Tiedoston lopun yli ei voi kommentoida"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Kumouspuskurissa ei ole mitään!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "tekstin lisäys"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "rivin katkaisu"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "tekstin poisto"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Valinnassa:    "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "rivin liitos"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "tekstin korvaus"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Muokkaa korvausta"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "tekstin leikkaus"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "tekstin epäleikkaus"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "tekstin sijoitus"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "sisennä"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "epäsisennä"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "kommentoi"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "epäkommentoi"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Kumottiin toiminto (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Ei mitään tehtäväksi uudelleen!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Tehtiin toiminto uudelleen (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Haarauttaminen epäonnistui"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, fuzzy, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Lainausmerkintä %s ei kelpaa: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Epätasaaminen onnistuu nyt!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Tasaa koko tiedosto"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Tasaa nykyinen kappale"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Löytymätön sana: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Seuraava sana..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Luodaan väärin kirjoitettujen sanojen lista, odota..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Virhe ”spell”-komennon käynnistyksessä"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Virhe ”sort -f” -komennon käynnistyksessä"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Virhe ”uniq”-komennon käynnistyksessä"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:3037
+#: src/text.c:2801
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
 
-#: src/text.c:3047
+#: src/text.c:2811
 #, fuzzy
 msgid "Save modified buffer before linting?"
 msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 #, fuzzy
 msgid "Invoking linter, please wait"
 msgstr "Kutsutaan esikastelua, odota vähän"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Saatiin 0 jäsennettävissä olevaa riviä komennolta: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Ensimmäisessä viestissä"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Viimeisessä viestissä"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sSanat: %zu  Rivit: %zd  Merkit: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Valinnassa:    "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Merkintarkka syöte"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Ei vastaavaavuuksia"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nanolta loppui muisti!"
@@ -2641,77 +2694,82 @@ msgstr "Liikaa virheitä vakiosyötteestä"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode-syöte: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "HAKEMISTO:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Muokattu"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Näkymä"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Rajoitettu tila"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "rivi %zd/%zd (%d %%), sarake %zu/%zu (%d %%), merkki %zu/%zu (%d %%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Nano-tekstieditori"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Erityiset kiitokset:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundationille"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "monille kielenkääntäjille ja Translation Projectille"
 
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Kiitos nanon käyttämisestä!"
 
@@ -2720,6 +2778,16 @@ msgstr "Kiitos nanon käyttämisestä!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Virheellinen näppäin yhden puskurin tilassa"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Epäleikkaa"
+
+#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
+#~ msgid "Unjustify"
+#~ msgstr "Epätasaa"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Liitä leikepuskurista nykyiselle riville"
+
 #  Tämä on Etsi-valikossa.
 #  80 sarakkeen näytöllä mahtuu 11 merkkiä.
 #~ msgid "PrevHstory"
@@ -2730,6 +2798,40 @@ msgstr "Kiitos nanon käyttämisestä!"
 #~ msgid "NextHstory"
 #~ msgstr "SeurHistor."
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Pehmeä vieritys"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Älä lisää rivinvaihtoja tiedostojen loppuun"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Käytä yhtä lisäriviä muokkaukseen"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Aseta kova rivityskohta sarakkeeseen #cols"
+
+#~ msgid "text add"
+#~ msgstr "tekstin lisäys"
+
+#~ msgid "text delete"
+#~ msgstr "tekstin poisto"
+
+#~ msgid "text replace"
+#~ msgstr "tekstin korvaus"
+
+#~ msgid "text cut"
+#~ msgstr "tekstin leikkaus"
+
+#~ msgid "text uncut"
+#~ msgstr "tekstin epäleikkaus"
+
+#, fuzzy
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Lainausmerkintä %s ei kelpaa: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Epätasaaminen onnistuu nyt!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Käynnistetään oikoluin, odota"
 
diff --git a/po/fr.po b/po/fr.po
@@ -6,14 +6,14 @@
 # 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-2018.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-05 22:34+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-12 23:38+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -34,9 +34,9 @@ msgstr "Impossible d'ouvrir le répertoire : %s"
 msgid "Go To Directory"
 msgstr "Changer de répertoire"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -51,9 +51,9 @@ msgstr "Impossible d'aller hors de %s"
 msgid "Can't move up a directory"
 msgstr "Impossible de passer au répertoire supérieur"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -99,17 +99,17 @@ msgstr "C'est la seule occurrence"
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nom de syntaxe inconnu : %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "Échec de magic_load() : %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "Échec de magic_file(%s) : %s"
@@ -202,7 +202,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu ligne [%s]"
 msgstr[1] "%s -- %zu lignes [%s]"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
@@ -306,510 +306,504 @@ msgstr "Fichier à lire [depuis %s]"
 msgid "File to insert [from %s]"
 msgstr "Fichier à insérer [à partir de %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Répertoire de fonctionnement incorrect\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Répertoire de fonctionnement incorrect : %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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.) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Répertoire de copie de sécurité incorrect\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Répertoire de la copie de sécurité incorrect : %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossible d'écrire à l'extérieur de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Trop de copies de sécurité ?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu ligne écrite"
 msgstr[1] "%zu lignes écrites"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Copie de sécurité]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Ajouter la sélection au début d'un fichier"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Ajouter la sélection à la fin d'un fichier"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Écrire la sélection dans un fichier"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nom du fichier au tête duquel ajouter"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nom du fichier à la fin duquel ajouter"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nom du fichier à écrire"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Trop petit"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Le fichier existe -- écriture impossible"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Le fichier « %s » existe, VOULEZ-VOUS L'ÉCRASER ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Le fichier sur disque a changé"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Le fichier a été modifié depuis son ouverture. Continuer à sauver ?"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(suite)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Fermer"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Coller"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Dé-justif."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Annuler la fonction courante"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Afficher ce message"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Fermer l'espace en cours / Quitter nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Écrire le fichier en cours (ou la zone marquée) sur disque"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
-msgstr "Insérer un autre fichier dans l'espace courant (ou un nouvel espace)"
+msgstr "Insérer un fichier dans l'espace courant (ou un nouvel espace)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
-msgstr "Rechercher vers l'avant une chaîne ou une expression rationnelle"
+msgstr "Rechercher vers l'avant une chaîne ou une exp. rationnelle"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
-msgstr "Rechercher vers l'arrière une chaîne ou une expression rationnelle"
+msgstr "Rechercher vers l'arrière une chaîne ou une exp. rationnelle"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Recherche d'une chaîne en avant"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Recherche d'une chaîne en arrière"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Mettre à jour la liste des fichiers"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Aller à la colonne de gauche"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Aller à la colonne de droite"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Aller à la première ligne de cette colonne"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Aller à la dernière ligne de cette colonne"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Monter d'un écran"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Descendre d'un écran"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
-msgstr "Couper la ligne courante (ou la zone marquée) vers le presse-papiers"
+msgstr "Couper ligne courante (ou zone marquée) vers le presse-papiers"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Coller le presse-papiers à partir de la ligne courante"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Coller le contenu du presse-papiers à la position du curseur"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Indiquer la position du curseur"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Appeler le correcteur orthographique (si dispo.)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Remplacer une chaîne ou une expression rationnelle"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Aller à la ligne et à la colonne indiquées"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marquer le texte depuis la position du curseur"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
-msgstr "Copier la ligne courante (ou la zone marquée) dans le presse-papiers"
+msgstr "Copier la ligne cour. (ou zone marquée) dans le presse-papiers"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Effacer la ligne courante (ou la zone marquées)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Mettre en retrait la ligne courante (ou les lignes marquées)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
-msgstr "Diminuer le retrait de la ligne courante (ou des lignes marquées)"
+msgstr "Diminuer retrait ligne courante (ou lignes marquées)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Annuler la dernière opération"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Refaire la dernière opération annulée"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Reculer d'un caractère"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avancer d'un caractère"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Reculer d'un mot"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avancer d'un mot"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Aller à la ligne précédente"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Aller à la ligne suivante"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Aller au début de la ligne courante"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Aller à la fin de la ligne courante"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Aller au bloc de texte précédent"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Aller au bloc de texte suivant"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Aller au début du paragraphe, puis à celui du précédent"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Aller à la fin du paragraphe, puis à celle du suivant"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Aller à la première ligne du fichier"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Aller à la dernière ligne du fichier"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Aller au crochet correspondant"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Remonter d'une ligne sans déplacer le curseur sur le texte"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Descendre d'une ligne sans déplacer le curseur sur le texte"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Basculer vers l'espace précédent"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Basculer vers l'espace suivant"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Insérer le prochain caractère tel quel"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Insérer une tabulation à la position du curseur"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Insérer un passage à la ligne à la position du curseur"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Supprimer le caractère sous le curseur"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprimer le caractère à la gauche du curseur"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Coupe en arrière du curseur au début du mot"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Supprimer en arrière du curseur au début du mot"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Coupe en avant du curseur à la fin du mot"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Supprimer en avant du curseur à la fin du mot"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Couper du curseur à la fin du fichier"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justifier le paragraphe courant"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justifier le fichier entier"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Compter le nombre de mots, de lignes et de caractères"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraîchir (redessiner) l'écran courant"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspendre l'éditeur (si suspendre est activé)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Essayer de compléter le mot courant"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
-msgstr "Commenter/décommenter la ligne courante (ou les lignes marquées)"
+msgstr "Commenter/décommenter ligne courante (ou lignes marquées)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Écrire sans poser de question"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Rechercher la prochaine occurrence en avant"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Rechercher la prochaine occurrence en arrière"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Début/arrêt d'enregistrement d'une macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Lancer la dernière macro enregistrée"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Chercher en tenant compte de la casse (commutateur)"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inverser le sens de la recherche"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Utiliser des expressions rationnelles (commutateur)"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Rappeler la précédente chaîne de recherche"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Rappeler la chaîne de recherche suivante"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Utiliser le format DOS (commutateur)"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Utiliser le format Mac (commutateur)"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Ajouter à la fin du fichier (commutateur)"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Ajouter au début du fichier (commutateur)"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Créer une copie de sécurité de l'original (commutateur)"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Exécuter une commande externe"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Envoyer l'espace en cours (ou la zone marquée) à une commande"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Pas de conversion depuis les formats DOS et Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Utiliser un nouvel espace (commutateur)"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Fermer l'espace sans l'écrire"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Ouvrir le navigateur de fichiers"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Sortir du navigateur de fichiers"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Aller au premier fichier de la liste"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Aller au dernier fichier de la liste"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Aller au précédent fichier de la liste"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Aller au prochain fichier de la liste"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Changer de répertoire"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Appeler l'analyseur statique (si dispo.)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Aller au message précédent de l'analyse statique"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Aller au message suivant de l'analyse statique"
 
@@ -817,278 +811,282 @@ msgstr "Aller au message suivant de l'analyse statique"
 # Ils sont utilisés comme entrée des menus du bas d'écran.
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Aide"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Écrire"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Lire fich."
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justifier"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Chercher"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Remplacer"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
-msgstr "Aller -> rép."
+msgstr "Aller rép."
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Couper"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Coller"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Orthograp."
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos. cur."
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Aller lig."
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refaire"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marquer"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copier"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Resp.casse"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Exp. ratio."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "->Arrière"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Rechercher"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Plus ancien"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Plus récent"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Justifier"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
-msgstr "Parenthèse corresp."
-
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Écrire"
+msgstr "-> Crochet"
 
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Retrouver"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "En arrière"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "En avant"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Mot précédent"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Mot suivant"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Début doc."
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Lig. préc."
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Lig. suiv."
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Remonter"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Descendre"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloc précédent"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloc suivant"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Début para."
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fin para."
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Page préc."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Page suiv."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "1re ligne"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Dern. ligne"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Fich. préc."
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fich. suiv."
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tabulation"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "RetourArr."
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Supprimer"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Couper à gauche"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Suppr. à gauche"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Couper à droite"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Suppr. à droite"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Nombre de mots"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Entrée telle quelle"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspendre"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Mise en retrait"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Diminuer le retrait"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Commenter la ligne"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Compléter"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Enregistrer"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Lancer la macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Supprimer"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Analyse statique"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Écrire"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Rechercher"
@@ -1168,59 +1166,59 @@ msgstr "Analyse suiv."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Mode aide"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Afficher la position du curseur"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Défilement progressif"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Défilement saccadé (par demi-écrans)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Affichage automatique sur plusieurs lignes"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Coloration syntaxique"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Retrait auto."
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Couper jusqu'en fin de ligne"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Passer à la ligne automatiquement"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numérotation des lignes"
 
@@ -1613,20 +1611,20 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Erreur lors de l'écriture de %s : %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Touche illégale en mode visualisation"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Cette fonction est désactivée en mode restreint"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "L'aide n'est pas disponible"
 
 # Fin des entrées de menu sur 10 caractères
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1636,7 +1634,7 @@ msgstr ""
 "Espace écrit dans %s\n"
 
 # Fin des entrées de menu sur 10 caractères
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1646,7 +1644,7 @@ msgstr ""
 "Espace non écrit dans %s : %s\n"
 
 # Fin des entrées de menu sur 10 caractères
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1655,7 +1653,7 @@ msgstr ""
 "\n"
 "Espace non écrit : %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1666,7 +1664,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1676,7 +1674,7 @@ msgstr ""
 "précédé d'un « + » devant le nom de fichier. Pour ajouter le numéro de\n"
 "colonne, placez-le derrière le numéro de ligne, séparé par une virgule.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1686,281 +1684,293 @@ msgstr ""
 "standard.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tOption longue GNU\t\tDescription\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Touche « Début » intelligente"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Créer des copies de sécurité"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <rép.>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<rép.>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Répertoire des copies de sécu. uniques"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Affiche en gras le texte vidéo inverse"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Lire les fichiers dans un nouvel espace"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Util. des fichiers verrou (type vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Mémorise les recherches & remplacements"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Ne pas utiliser les fichiers nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Afficher un guide cette colonne"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrige la gestion du pavé numérique"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Pas d'ajout de ligne en fin de fichier"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Pas d'ajout d'une fin de ligne [défaut]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
-msgstr "Retirer les espaces de fin en passant à la ligne"
+msgstr "Suppr. espaces finaux sur coupure ligne"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Pas de conversion depuis DOS et Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Utiliser 1 ligne de plus pour l'édition"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Mémoriser la position du curseur"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <exp. rat.>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<expr. rat.>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
-msgstr "Exp. rationnelle correspondant aux guillemets"
+msgstr "Exp. rat. correspondant aux guillemets"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mode restreint"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Défilement ligne par ligne"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <nombre>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<nombre>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Largeur des tabulations"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Effacement rapide de la barre d'état"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Affiche la version et s'arrête"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Meilleure détection des limites de mots"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <chaîne>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<chaîne>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Autres caractères appartenant aux mots"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nom>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nom>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Définit la syntaxe de coloration"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
-msgstr "Eff. arr. et Suppr. effacent les zones marquées"
+msgstr "Eff. arr./Suppr. effacent zones marquées"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Couper les lignes affichées sur un blanc"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Active le passage auto. à la ligne"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Afficher la position du curseur"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige la confusion effac. arr./suppr."
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Ligne vide sous la barre de titre"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Finir le texte par un passage à la ligne"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
-msgstr "Affiche le curseur dans l'aide et navigateur de fichier"
+msgstr "Curseur dans l'aide & le navigateur"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Affiche ce message et se termine"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Mise en retrait automatique"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Avancer par demi-écran, et non par ligne"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Coupe du curseur à la fin de la ligne"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Afficher le numéro de ligne"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Active l'utilisation de la souris"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Ne pas lire le fichier (mais l'écraser)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <rép.>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<rép.>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Répertoire de fonctionnement"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Préserver ^Q (XON) & ^S (XOFF)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <numéro>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#num>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Passer à la ligne sur la colonne #num"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Largeur du texte (justif., coupe auto.)"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Correcteur orthographique"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Sauver en quittant, sans question"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Écrire par défaut au format Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Mode visualisation (lecture seule)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Désactive le passage auto. à la ligne"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Pas de passage auto. à la ligne [défaut]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Ne pas afficher les deux lignes d'aide"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
-msgstr "Ctrl+Flèche droite s'arrête en fin de mot"
+msgstr "Ctrl+Flèche droite arrête en fin de mot"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Autoriser à suspendre"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Affichage multiligne automatique"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, version %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s les contributeurs de nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Adr. él. : nano@nano-editor.org\tSite : http://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1969,276 +1979,295 @@ msgstr ""
 "\n"
 " Compilé avec les options :"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Pas de nom de fichier"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Écrire l'espace modifié ? (Répondre « Non » ABANDONNE les modifications.)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Lecture depuis l'entrée standard ; entrez ^D ou ^D^D pour terminer.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Échec d'ouverture de l'entrée standard : %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Réception de SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Désolé ! Nano s'est planté ! Code : %d. Merci de nous signaler le problème.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspendre est désactivé"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "- marche"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "- arrêt"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Touche non affectée"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Touche non assignable : M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Touche non affectée : M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Touche non assignable : ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Touche non affectée : ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Touche non affectée : %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "La colonne « %s » du guide est incorrecte"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Option %s ignorée ; c'est l'option par défaut\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Taille de tabulation « %s » demandée non valide"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La colonne maximale « %s » n'est pas valide"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Mauvaise expr. rat. de citation « %s » : %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Numéro de ligne ou de colonne incorrect"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Erreurs dans « %s »"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Bienvenue dans nano. Pressez Ctrl+G pour un résumé des commandes."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Oo"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Oui"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Non"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Tous"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Erreur dans %s à la ligne %zu : "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument %s contient un \" non fermé"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Les expr. rationnelles doivent être encadrées par des « \" »"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Mauvaise expr. rationnelle « %s » : %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Nom de syntaxe manquant"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Guillemet non refermé dans un nom de syntaxe"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Le nom « none » est un nom de syntaxe réservé"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "La syntaxe « default » n'accepte pas d'extension"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Raccourci manquant"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Raccourci trop court"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "La touche %s n'existe pas"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 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:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Vous devez indiquer le menu (ou « all » pour tous) auquel ce raccourci est "
 "rattaché"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossible de trouver la fonction « %s »"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossible de trouver le menu « %s »"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, 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:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Désolé, le raccourci « %s » ne peut être réattribué"
+msgid "Keystroke %s may not be rebound"
+msgstr "Le raccourci « %s » ne peut être réattribué"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erreur lors de l'expansion de %s : %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Impossible de comprendre la couleur « %s »"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Une couleur de fond ne peut pas être lumineuse (bright)"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Une commande « %s » doit être précédée d'une commande « syntaxe »"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Nom de couleur manquant"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Expression rationnelle manquante après la commande « %s »"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Expr. rationnelle vide"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "« start » nécessite un « end » correspondant"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 "La syntaxe « default » n'accepte pas les expressions rationnelles « %s »"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Argument manquante après « %s »"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "L'argument de « %s » n'est pas terminé par un \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Aucune touche associée à la fonction « %s » dans le menu « %s ». Arrêt.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2246,58 +2275,58 @@ msgstr ""
 "Si besoin, lancez nano avec l'option -I pour modifier les paramètres de "
 "votre fichier nanorc\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Impossible de trouver la syntaxe « %s » à étendre"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La syntaxe « %s » ne contient aucune commande de coloration (color)"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "La commande « %s » est interdite dans un fichier inclus"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Impossible de comprendre la commande « %s »"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Option manquante"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Option « %s » inconnue"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Impossible de désactiver l'option « %s »"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'option « %s » nécessite un argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "L'argument n'est pas une chaîne multioctet valable"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Les blancs sont interdits"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Indiquez 2 caractères (mono-colonne)"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossible de trouver mon répertoire personnel ! Ouah !"
 
@@ -2359,239 +2388,247 @@ msgstr "N'est pas un crochet"
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marque posée"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marque enlevée"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "erreur d'appel de « %s »"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 "L'ajout de commentaire n'est pas pris en charge pour ce type de fichier"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Impossible de dépasser la fin du fichier"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "ajout de texte"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "ajout"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "nouvelle ligne"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "effacement de texte"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "suppression"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "fusion de lignes"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "remplacement de texte"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "remplacement"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
-msgstr "effacer"
+msgstr "effacement"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "texte coupé"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "couper"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "texte restauré"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "coller"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "insertion de texte"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "insertion"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "mise en retrait"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "diminuer le retrait"
+msgstr "diminution du retrait"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "commenter"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "décommenter"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Action annulée (%s)"
+msgid "Undid %s"
+msgstr "%s annulé(e)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Rien à refaire !"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Action refaite (%s)"
+msgid "Redid %s"
+msgstr "%s refait(e)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Impossible de créer un tube"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtrage"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Échec d'ouverture du tube : %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Mauvaise chaîne de citation %s : %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "justification"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Sélection justifiée"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Fichier justifié"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Il est maintenant possible de dé-justifier !"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Paragraphe justifié"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Mot %s introuvable"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Entrez une correction"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Mot suivant"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Création de la liste des fautes, veuillez patienter..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Impossible d'obtenir la taille de tampon du tube"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "erreur d'appel de « spell »"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "erreur à l'appel de « sort -f »"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "erreur à l'appel de « uniq »"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Échec de la correction : %s : %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Sauver l'espace modifié avant l'analyse statique ?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Lancement de l'analyse statique, veuillez patienter"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "La commande « %s » n'a produit aucune ligne analysable"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ce message concerne le fichier non ouvert %s. L'ouvrir dans un nouvel "
 "espace ?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Pas de message pour ce fichier"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Premier message"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Dernier message"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%s %zu mots,  %zd lignes, %zu caractères"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Contenu de la sélection : "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrée telle quelle"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Pas de fragment de mot"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Aucune autre correspondance"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Aucune correspondance"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "nano n'a plus de mémoire !\n"
 
@@ -2617,78 +2654,124 @@ msgstr "Trop d'erreur sur l'entrée standard\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Séquence inconnue"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrée Unicode : %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Analyse statique --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "RÉP. :"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modifié"
 
 # Cela devrait être « visualisation », pour être logique.
 # Mais il faut quelque chose de court qui tienne sans
 # déborder sur le bord haut de l'écran.
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Voir"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Restreint"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Les avertissements suivants ne sont pas affichés"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "ligne %zd/%zd (%d%%), col. %zu/%zu (%d%%), car. %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "L'éditeur de texte nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "les nombreux traducteurs et le Translation Project (TP)"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "et toute autre personne que nous aurions oubliée..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
+
+#~ msgid "Uncut Text"
+#~ msgstr "Coller"
+
+#~ msgid "Unjustify"
+#~ msgstr "Dé-justif."
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Coller le presse-papiers à partir de la ligne courante"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Défilement progressif"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Pas d'ajout de ligne en fin de fichier"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Utiliser 1 ligne de plus pour l'édition"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Passer à la ligne sur la colonne #num"
+
+#~ msgid "text add"
+#~ msgstr "ajout de texte"
+
+#~ msgid "text delete"
+#~ msgstr "effacement de texte"
+
+#~ msgid "text replace"
+#~ msgstr "remplacement de texte"
+
+#~ msgid "text cut"
+#~ msgstr "texte coupé"
+
+#~ msgid "text uncut"
+#~ msgstr "texte restauré"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Mauvaise chaîne de citation %s : %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Il est maintenant possible de dé-justifier !"
diff --git a/po/ga.po b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.9.4-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-03-04 05:44-0600\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -28,9 +28,9 @@ msgstr "Ní féidir an chomhadlann a oscailt: %s"
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cealaithe"
 
@@ -45,9 +45,9 @@ msgstr "Ní féidir dul amach as %s"
 msgid "Can't move up a directory"
 msgstr "Ní féidir dul go dtí an chomhadlann thuas"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
@@ -94,17 +94,17 @@ msgstr "Seo é an toradh amháin atá ann"
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Ainm comhréire anaithnid: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "Theip ar magic_load(): %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "Theip ar magic_file(%s): %s"
@@ -202,7 +202,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
@@ -321,48 +321,50 @@ msgstr "Comhad le hionsá [ó %s]"
 msgid "File to insert [from %s]"
 msgstr "Comhad le hionsá [ó %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Comhadlann oibre neamhbhailí\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Níorbh fhéidir cúltaca a scríobh; sábháil mar sin féin? (N mura bhfuil tú "
 "cinnte)"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Comhadlann chúltaca neamhbhailí\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ní féidir scríobh lasmuigh de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "An iomarca comhad cúltaca?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -372,757 +374,759 @@ msgstr[2] "Scríobhadh %zu líne"
 msgstr[3] "Scríobhadh %zu líne"
 msgstr[4] "Scríobhadh %zu líne"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formáid DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formáid Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Cúltaca]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Réamhcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Iarcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Scríobh an Roghnúchán i gComhad"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Comhad ar mian leat Réamhcheangal leis"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Comhad ar mian leat Iarcheangal leis"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Ainm Comhaid le Scríobh"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Tá an comhad ann - ní féidir forscríobh"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Tá comhad \"%s\" ann; FORSCRÍOBH? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Athraíodh an comhad ar an diosca"
 
-#: src/files.c:2291
+#: src/files.c:2285
 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:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Scoir"
 
 # next batch are main menu - should be 9 characters at most
 # 10 characters fit, but with no space before next option
 # I'm assuming an 80 column terminal here
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Dún"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Díghearr Téacs"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "DíComhfhdú"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Scríobh an comhad reatha (nó an réigiún marcáilte) ar an diosca"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Ionsáigh comhad eile isteach sa maolán reatha (nó i maolán nua)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Cuardach ar aghaidh ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Cuardach ar gcúl ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Cuardach ar theaghrán"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Cuardach ar theaghrán"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Athnuaigh an liosta comhad"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Téigh go dtí an colún ar chlé"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Téigh go dtí an colún ar dheis"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Téigh go dtí an chéad ró sa gcolún seo"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Téigh go dtí an ró deireanach sa gcolún seo"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Téigh suas scáileán amháin"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Téigh síos scáileán amháin"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Gearr an líne reatha (nó réigiún marcáilte) agus cuir sa mhaolán gearrtha é"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Ionsáigh táb ag an gcúrsóir"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Rith an litreoir, má tá ceann ar fáil"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Ionadaigh teaghrán nó slonn ionadaíochta"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Téigh go dtí an líne agus an colún sonraithe"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marcáil téacs ag tosú ag an gcúrsóir"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Cóipeáil an líne reatha (nó réigiún marcáilte) agus cuir sa mhaolán gearrtha "
 "é"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Eangaigh an líne reatha (nó na línte marcáilte)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Eangaigh an líne reatha (nó na línte marcáilte)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Dí-eangaigh an líne reatha (nó na línte marcáilte)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Cealaigh an oibríocht is déanaí"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Carachtar amháin siar"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Ar aghaidh carachtar amháin"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Téigh siar focal amháin"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Téigh ar aghaidh focal amháin"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Téigh go tús na líne reatha"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Téigh go deireadh na líne reatha"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Téigh go dtí an bloc téacs roimhe seo"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Téigh go dtí an chéad bhloc téacs eile"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Téigh go dtí an chéad líne sa chomhad"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Téigh go dtí an líne dheiridh sa chomhad"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Téigh go dtí an lúibín a mheaitseálann"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Scrollaigh suas líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Scrollaigh síos líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Athraigh go dtí an maolán roimhe seo"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Athraigh go dtí an chéad mhaolán eile"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Ionsáigh an chéad charachtar eile go litriúil"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Ionsáigh líne nua ag an gcúrsóir"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Scrios an carachtar faoin chúrsóir"
 
-#: src/global.c:619
+#: src/global.c:613
 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:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Gearr ar gcúl ón chúrsóir go dtí tús an fhocail"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Gearr ar aghaidh ón chúrsóir go dtí tús an chéad fhocail eile"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Gearr ón chúrsóir go dtí deireadh an chomhaid"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Comhfhadaigh an t-alt reatha"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/global.c:634
+#: src/global.c:628
 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:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Déan iarracht an focal reatha a chríochnú"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Athraigh stádas nóta tráchta den líne reatha (nó na línte marcáilte)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Sábháil an comhad gan deimhniú"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "An chéad toradh eile ar gcúl"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "An chéad toradh eile ar aghaidh"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Tosaigh/stop macra a thaifeadadh"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Rith an macra taifeadta is déanaí"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Scoránaigh cásíogaireacht"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Scoránaigh treo an chuardaigh"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Scoránaigh úsáid slonn ionadaíochta"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Athghair an teaghrán cuardaigh roimhe seo"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Athghair an chéad teaghrán cuardaigh eile"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Scoránaigh úsáid d'fhormáid DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Scoránaigh úsáid d'fhormáid Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Scoránaigh iarcheangal"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Scoránaigh réamhcheangal"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Scoránaigh cúltacaí"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Rith ordú seachtrach"
 
-#: src/global.c:674
+#: src/global.c:668
 #, fuzzy
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Scríobh an comhad reatha (nó an réigiún marcáilte) ar an diosca"
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Ná tiontaigh comhaid ó fhormáid Dos/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Scoránaigh úsáid mhaoláin nua"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Dún an maolán gan sábháil"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Oscail brabhsálaí na gcomhad"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Scoir brabhsálaí na gcomhad"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Téigh go dtí an comhad roimhe seo sa liosta"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Téigh go dtí an chéad chomhad eile sa liosta"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Téigh go comhadlann"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Rith glantóir cóid (lint), má tá ceann ar fáil"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "An tcht roimhe seo ó lint"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "An chéad tcht eile ó lint"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Cabhair"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Scríobh"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Léigh"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Comhfhadú"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Athnuaigh"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Cuardach"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ionadaigh"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "OsclComdln"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Gearr"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Gearr"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Litreoir"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Téigh Go Líne"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Athdhéan"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "MarcáilTcs"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "CóipTéacs"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Cásíogair"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Slonn"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Siar"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Gan Ionadú"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "LánComhfhadú"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Go Lúibín"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Sábháil"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "LorgArgCúl"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Roimhe Seo"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Ar Aghaidh"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "FocalRmh"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "FocalArA"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "An Chéad Líne Eile"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "ScrollSuas"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "ScrollSíos"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "BlocRmhSeo"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "BlocArAgh"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "BarrAnAilt"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "DeirAnAilt"
 
 # main menu - keep short?
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Ar Ais"
 
 # main menu - keep short?
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Chéad Líne"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "LíneDheir"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "ComhadRmh"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "ComhadArA"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Cúlspás"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Scrios"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "GearrArClé"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "GrrArDheis"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "LíonFocal"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Litriúil"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "ArFionraí"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "eangú"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "dí-eangú"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "NótaíTrcht"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Críochnaigh"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Taifead"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Rith Macra"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "MarcáilTcs"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Glantóir"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Sábháil"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "TéighTéacs"
@@ -1204,59 +1208,60 @@ msgstr "Chéad Tcht Lint Eile"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Mínscrollú"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Scrollaigh de réir línte in ionad leathscáileáin"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Timfhilleadh bog de línte fada"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Timfhilleadh crua de línte fada"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Uimhriú línte"
 
@@ -1628,19 +1633,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Earráid agus %s á scríobh: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Eochair neamhcheadaithe sa mhód amhairc"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Níl an fheidhm seo ar fáil sa mhód teoranta"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Níl cabhair ar fáil"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1649,7 +1654,7 @@ msgstr ""
 "\n"
 "Scríobhadh an maolán i %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1658,7 +1663,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán i %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1667,7 +1672,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1678,7 +1683,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1688,7 +1693,7 @@ msgstr ""
 "'+' roimh ainm an chomhaid. Is féidir uimhir an cholúin a chur tar éis "
 "camóg.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1697,285 +1702,300 @@ msgstr ""
 "Má thugtar '-' mar ainm comhaid, léann nano sonraí ón ionchur caighdeánach.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Rogha\t\tRogha fhada GNU\t\tMíniú\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Cumasaigh eochair bhaile chliste"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Sábháil cúltacaí de chomhaid atá ann cheana"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <comhadlann>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<comhadlann>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Úsáid cló trom in ionad téacs aisiompaithe"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Léigh comhad i maolán nua de réir réamhshocraithe"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Úsáid comhaid ghlasála (ar nós vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Logáil agus léigh stair na dteaghrán cuardaigh"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Ná húsáid comhaid nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Téigh go dtí an chéad ró sa gcolún seo"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Deisigh mearbhall maidir leis an eochaircheap uimhriúil"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 "Scrios spásanna ó dheireadh na líne agus timfhilleadh crua á chur i bhfeidhm"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ná tiontaigh comhaid ó fhormáid Dos/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Lógáil agus léigh ionadaithe an chúrsóra"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <teaghrán>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<teaghrán>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mód teoranta"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Scrollaigh de réir línte in ionad leathscáileáin"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#colúin>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#colúin>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Socraigh leithead de tháib a bheith #colúin"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Bánaigh an barra stádais go gasta"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Taispeáin eolas faoin leagan agus scoir"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Braith teorainneacha idir focail i slí níos cruinne"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <teaghrán>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<teaghrán>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Carachtair eile mar chuid d'fhocail"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <ainm>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<ainm>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Sainmhíniú na comhréire le haghaidh dathaithe"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Déan timfhilleadh bog ag spás bán"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ná déan timfhilleadh ar línte fada"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Deisigh mearbhall idir na heochracha \"Backspace\" agus \"Delete\""
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Taispeáin an cúrsóir i mbrabhsálaí comhad"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Taispeáin an chabhair seo agus scoir"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Eangaigh línte nua go huathoibríoch"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Taispeáin uimhreacha línte"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Cumasaigh úsáid na luiche"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Ná léigh an comhad (scríobh amháin)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <comhadlann>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<comhadlann>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Socraigh an chomhadlann oibre"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Caomhnaigh eochracha XON (^Q) agus XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#colúin>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colúin>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Socraigh timfhilleadh crua ag colún #colúin"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <clár>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<clár>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Cumasaigh litreoir malartach"
 
-#: src/nano.c:884
+#: src/nano.c:890
 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:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Sábháil comhaid i bhformáid Unix de réir réamhshocraithe"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Mód amhairc (inléite amháin)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ná déan timfhilleadh ar línte fada"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Ná taispeáin an dá líne chabhrach"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Ceadaigh cur ar fionraí"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Cumasaigh timfhilleadh bog"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, leagan %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " © 2014-%s rannpháirtithe nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " R-phost: nano@nano-editor.org\tGréasán: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1984,331 +2004,351 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Gan ainm comhaid"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Sábháil athruithe? (\"No\" = ní sábhálfar athruithe.)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Níorbh fhéidir stdin a oscailt: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Níorbh fhéidir stdin a athoscailt ón mhéarchlár\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun filleadh ar nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Ní cheadaítear cur ar fionraí"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Eochair neamhcheangailte"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Eochair nach féidir a cheangal: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Eochair gan cheangal: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Eochair nach féidir a cheangal: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Eochair gan cheangal: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Eochair gan cheangal: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Ainm eochrach neamhbhailí %s"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Iarradh méid táib neamhbhailí \"%s\""
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Iarradh méid líonta neamhbhailí \"%s\""
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Úsáid '%s -h' chun liosta na roghanna a fháil.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Botúin i '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Uu"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sábháil"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ná Sábháil"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Uile"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Earráid i %s ar líne %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Ní mór carachtar \" a bheith ag tús agus ag deireadh sloinn ionadaíochta"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Ainm comhréire ar iarraidh"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Comhartha athfhriotail corr in ainm comhréire"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Comhréir \"none\" in áirithe"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Ainm eochrach ar iarraidh"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Ainm eochrach róghearr"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Ní mór \"^\", \"M\", nó \"F\" a bheith ag tús ainm na heochrach"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Ainm eochrach neamhbhailí %s"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 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"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Caithfidh tú roghchlár (nó \"all\") a shonrú ina gceanglófar an eochair"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go feidhm"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Níl feidhm '%s' ann i roghchlár '%s'"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Ár leithscéal, ní féidir eochair \"%s\" a athcheangal"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Earráid agus %s á leathnú: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Níor tuigeadh dath \"%s\""
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Ní cheadaítear dath cúlra geal"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Is gá ordú 'syntax' a chur roimh ordú '%s'"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Slonn ionadaíochta ar iarraidh tar éis ordú '%s'"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Slonn ionadaíochta folamh"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 "Ní féidir sloinn ionadaíochta '%s' a úsáid leis an gcomhréir \"default\""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Argóint ar iarraidh tar éis '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Tá \" ar iarraidh ag deireadh argóint '%s'"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Más gá, úsáid nano leis an rogha -I chun do chuid socruithe nanorc a athrú.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Níor aimsíodh comhréir \"%s\" lena leathnú"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Rogha ar iarraidh"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Rogha anaithnid \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ní féidir rogha \"%s\" a dhíchumasú"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Níl an argóint ina teaghrán bailí ilbheart"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
@@ -2373,238 +2413,251 @@ msgstr "Ní lúibín é"
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Socraíodh Marc"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Díshocraíodh Marc"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Ní féidir nótaí tráchta a dhéanamh le comhad den chineál seo"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Ní féidir nóta tráchta a dhéanamh thar deireadh an chomhaid"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Níl faic le cealú!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "téacs a chur leis"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "briseadh líne"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "téacs a scriosadh"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Sa Roghnúchán:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "líne a cheangal"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "téacs a ionadú"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Cuir ionadaí in eagar"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "téacs a ghearradh"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "téacs a dhíghearradh"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "téacs a ionsá"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "eangú"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "dí-eangú"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "nóta tráchta"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "cealú nóta tráchta"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Cealaíodh gníomh (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Níl faic le hathdhéanamh!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Níorbh fhéidir stdin a oscailt: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Drochtheaghrán athfhriotail %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Is féidir Dí-Chomhfhadú anois!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/text.c:2606
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Comhfhadaigh an t-alt reatha"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Focal nach féidir aimsiú: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Cuir ionadaí in eagar"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "An chéad fhocal eile..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta focal mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 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:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Earráid agus \"spell\" á thosú"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Earráid agus \"sort -f\" á thosú"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Níl aon ghlantóir ar fáil don chineál comhaid seo!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "An bhfuil fonn ort an maolán athraithe a shábháil roimh ghlanadh?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Glantóir cóid á thosú, fan nóiméad"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fuarthas 0 líne inpharsáilte ón ordú: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Baineann an teachtaireacht seo le comhad %s gan oscailte; oscail i maolán "
 "nua é?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Ag an chéad teachtaireacht"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ag an teachtaireacht dheireanach"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sFocail: %zu  Línte: %zd  Carachtair: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Ionchur Litriúil"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Níl tuilleadh torthaí ann"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Gan torthaí"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "cuimhne nano ídithe!"
@@ -2632,76 +2685,81 @@ msgstr "An iomarca earráidí ó stdin"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Seicheamh anaithnid"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Ionchur Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Athraithe"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Amharc"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Mód teoranta"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Tuilleadh rabhadh nár taispeánadh"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "líne %zd/%zd (%d%%), colún %zu/%zu (%d%%), carachtar %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "na haistritheoirí go léir agus Tionscadal Aistriúcháin GNU"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Go raibh maith agat as úsáid nano!"
 
@@ -2711,9 +2769,18 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Eochair neamhcheadaithe mura bhfuiltear i mód ilmhaoláin"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Díghearr Téacs"
+
+#~ msgid "Unjustify"
+#~ msgstr "DíComhfhdú"
+
 #~ msgid "WhereIs Next"
 #~ msgstr "Cuardaigh Arís"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "An cuardach céanna arís"
 
@@ -2738,6 +2805,9 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Mínscrollú"
+
 #~ msgid "Backup files"
 #~ msgstr "Comhaid chúltaca"
 
@@ -2747,9 +2817,18 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgid "No conversion from DOS/Mac format"
 #~ msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
+
 #~ msgid "Quoting string"
 #~ msgstr "Teaghrán athfhriotail"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Socraigh timfhilleadh crua ag colún #colúin"
+
 #~ msgid "Reading from stdin, ^C to abort\n"
 #~ msgstr "Ag léamh ó stdin, ^C le scor\n"
 
@@ -2757,6 +2836,27 @@ msgstr "Go raibh maith agat as úsáid nano!"
 #~ msgstr ""
 #~ "Earráid mharfach: níl aon eochracha mapáilte le feidhm \"%s\". Ag scor.\n"
 
+#~ msgid "text add"
+#~ msgstr "téacs a chur leis"
+
+#~ msgid "text delete"
+#~ msgstr "téacs a scriosadh"
+
+#~ msgid "text cut"
+#~ msgstr "téacs a ghearradh"
+
+#~ msgid "text uncut"
+#~ msgstr "téacs a dhíghearradh"
+
+#~ msgid "text replace"
+#~ msgstr "téacs a ionadú"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Drochtheaghrán athfhriotail %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Is féidir Dí-Chomhfhadú anois!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Litreoir á thosú, fan nóiméad"
 
diff --git a/po/gl.po b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.7.0\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2016-09-14 23:15+0200\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@members.fsf.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -29,9 +29,9 @@ msgstr "Non se pode ascender por un directorio"
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -46,9 +46,9 @@ msgstr "Non se pode ir fóra de %s"
 msgid "Can't move up a directory"
 msgstr "Non se pode ascender por un directorio"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s: %s"
@@ -94,17 +94,17 @@ msgstr "Esta é a única aparición"
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nome da sintaxe descoñecido: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "fallou magic_load(): %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "fallou magic_file(%s): %s"
@@ -200,7 +200,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Novo buffer"
 
@@ -306,813 +306,815 @@ msgstr "Ficheiro a inserir [dende %s] "
 msgid "File to insert [from %s]"
 msgstr "Ficheiro a inserir [dende %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Establece-lo directorio de traballo"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Non se pode ascender por un directorio"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Non se pode escribir fóra de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro escribindo ficheiro de copia de seguridade %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Escribiuse %lu liña"
 msgstr[1] "Escribíronse %lu liñas"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [CopiaSeg]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Principio"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Final"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Gravar a Selección no Ficheiro"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Ficheiro ó que Engadir polo Principio"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Ficheiro ó que Engadir polo final"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Ficheiro a Gravar"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "O ficheiro \"%s\" xa existe, ¿SOBREESCRIBIR? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "O ficheiro foi modificado dende que o abriu, ¿continua gravando?"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(máis)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Saír"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Pechar"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "RepórTexto"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "DeXustif"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Amosar este texto de axuda"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Pechar o ficheiro cargado actualmente / Saír de nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Inserir outro ficheiro no actual"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Buscar cadea"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Buscar cadea"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Refresca-la lista de arquivos"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Ir á columna á esquerda"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Ir á columna á dereita"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Ir á columna á dereita"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Ir á columna á dereita"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Subir unha pantalla"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Baixar unha pantalla"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Corta-la liña actual e gardala no buffer de cortado"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Desfacer corte do buffer de cortado na liña actual"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Inserir unha lingüeta na posición do cursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Substituir unha cadea ou expresión regular"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto comenzando na posición do cursor"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Copia-la liña actual e almacenala no buffer de cortado"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Comentar/descomenta-la liña actual ou liñas marcadas"
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Comentar/descomenta-la liña actual ou liñas marcadas"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Comentar/descomenta-la liña actual ou liñas marcadas"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Desface-la última operación"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Reface-la última operación desfeita"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Recuar un carácter"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avanzar un carácter"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Recuar unha verba"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avanzar unha verba"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Pasar á liña previa"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Pasar á seguinte liña"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Pasar ó principio da liña actual"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Pasar ó final da liña actual"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Pasar ó bloque de texto previo"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Pasar ó seguinte bloque de texto"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pasar ó principio do parágrafo, entón ó parágrafo previo"
 
-#: src/global.c:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Pasar á primeira liña do ficheiro"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Pasar á derradeira liña do ficheiro"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Pasar ó paréntese correspondente"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Desprazar arriba unha liña sen despraza-lo cursor"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Desprazar unha liña abaixo sen despraza-lo cursor"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar ó anterior ficheiro"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Cambiar ó seguinte ficheiro"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Inseri-la seguinte pulsación literal"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir unha lingüeta na posición do cursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir unha nova liña na posición do cursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter baixo do cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo caracter á esquerda do cursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Cortar cara atrás dende o cursor ata o comenzo da seguinte palabra"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Cortar cara adiante dende o cursor ata o comenzo da seguinte palabra"
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Xustificar todo o ficheiro"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta-lo número de verbas, liñas e caracteres"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspende-lo editor (se a suspensión está activada)"
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Sangra-la liña actual"
 
-#: src/global.c:645
+#: src/global.c:639
 #, fuzzy
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Comentar/descomenta-la liña actual ou liñas marcadas"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Gravar ficheiro sen confirmación"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Procura a seguinte ocurrencia cara atrás"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Procura a seguinte ocurrencia cara adiante"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 #, fuzzy
 msgid "Run the last recorded macro"
 msgstr "Desface-la última operación"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Selector de sensibilidade a maiúsculas/minúsculas na busca"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Reverti-la dirección da busca"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Selector de uso de expresións regulares"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Recupera-la anterior cadea de busca/sustitución"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Recupera-la seguinte cadea de busca/sustitución"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Selector de uso do formato DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Selector de uso do formato Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Selector de engadir ó final"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Selector de engadir previo"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Selector de copiado de seguridade do ficheiro orixinal"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Non converti-los ficheiros do formato DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Selector de uso dun novo buffer"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Pechar buffer sen gravar"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Ir ó navegador de ficheiros"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Saír do navegador de ficheiros"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Pasar ó primeiro ficheiro da lista"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Pasar ó derradeiro ficheiro da lista"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Pasar ó anterior ficheiro da lista"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Pasar ó seguinte ficheiro da lista"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Chamar ó analizador de sintaxe, se hai un"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Pasar á anterior mensaxe do analizador"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Pasar á anterior mensaxe do analizador"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Obter Axud"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Gravar"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Ler Fich"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Xustificar"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Recargar"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "¿U-lo?"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Ir ó Directorio"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "CortarText"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "CortarText"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "PosicAct"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ir á liña"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refacer"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "SensMa/min"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "ExpReg"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Cara atrás"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Non Subst"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "XustComplt"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Ó delimitador"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Gravar"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "¿U-lo?"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Seguinte"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Adiante"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Verba Ant"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Verba Seg"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Liña Ant"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Seg Liña"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Desprazar Arriba"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloque Ant"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloque Seg"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Prin Parág"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fin Parágr"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Páxina ant"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Páxina seg"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Prim liña"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Ult liña"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Lingüeta"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Borrar"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "CortarEsqr"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "CortarDert"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "CortarAtaFin"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Conta Verbas"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Sangrar"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "De-Sangrar"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Coment Liñas"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Marcar"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Analizador"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Gravar"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ir a Text"
@@ -1194,59 +1196,60 @@ msgstr "Msg seg anlzr"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Modo de axuda"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Desprazar mainamente"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Desprazar liña a liña en vez de media pantalla"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Acortado maino de liñas longas"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Salientar sintaxe con cor"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tecla de 'smart home'"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Cortar ata o final"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Acortado forte de liñas longas"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "permitir rato"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1624,19 +1627,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Erro writing %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "A tecla non é válida en modo vista"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Esta función está deshabilitada en modo restrinxido"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Axuda non dispoñible"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1645,7 +1648,7 @@ msgstr ""
 "\n"
 "Gravouse o buffer en %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1654,7 +1657,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer en %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1663,7 +1666,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1674,298 +1677,312 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opción\t\tOpción longa GNU\t\tSignificado\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Activar tecla 'smart home'"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Gravar copias de seguridade dos ficheiros existentes"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Directorio para gravar ficheiros de copia de seguridade únicos"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Usar texto groso na vez de texto de video reverso"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir as lingüetas escritas a espacios"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Le-lo ficheiro nun novo buffer por defecto"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Usar ficheiros de bloqueo (estilo vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Gravar e le-la historia de cadeas a buscar/substituír"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Non mirar nos ficheiros nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Solucionar problema de confusión de teclado numérico"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Non engadir novas liñas ó final dos ficheiros"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converti-los ficheiros do formato DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Usar un ou máis liñas para editar"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Rexistrar e ler a posición do cursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <cad>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Modo restrinxido"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Desprazar liña a liña en vez de media pantalla"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Establece-lo ancho de lingüeta a #cols columnas"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Facer baleirado rápido da barra de estado"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Amosar información sobre a versión e saír"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detectar contornos das verbas máis axeitadamente"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <cad>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<cad>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Que outros caracteres son parte de palabras"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definición de sintaxe a empregar para corear"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Non facer cortado forte liñas longas"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Amosa-la posición do cursor constantemente"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arranxa-lo problema de confusión Retroceso/Borrar"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Amosar este texto de axuda e saír"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Sangra-las novas liñas automáticamente"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Cut from cursor to end of line"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Emprega-lo rato"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Non ler o ficheiro (só escribir nel)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Establece-lo directorio de traballo"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conserva-las teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Establecer punto de corte forte na columna #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Usar un corrector ortográfico alternativo"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Gravar ó saíren, sen preguntar"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Grava-lo arquivo por defecto en formato Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Modo visualización (só lectura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Non facer cortado forte liñas longas"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Non amosa-las dúas liñas de axuda"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Permitir suspensión"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Activar axuste suave de liñas"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr "GNU nano, versión %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, fuzzy, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014..%s os contribuíntes a nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Correo-e: nano@nano-editor.org\tWeb: https://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1974,274 +1991,294 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Non hai nome de ficheiro"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Grava-lo buffer modificado?  (Respondendo \"Non\" descartará os cambios). "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Non se puido reabri-la stdin dende o teclado, síntoo\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspensión non activa"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tecla non asociada"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tecla non asociable: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tecla non asociada: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Tecla non asociable: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tecla non asociada: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tecla non asociada: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "O nome de tecla %s non é válido"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Expresión regular \"%s\" incorrecta: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Si"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Non"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Todo"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Erro en %s na liña %lu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "As cadeas de expresión regular deben comezar e rematar cun carácter \" "
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" está reservada"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "A sintaxe \"default\" non toma extensións"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Falla o nome de tecla"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "O nome da tecla é demasiado curto"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "O nome de tecla debe comenzar con \"^\",\"M\", ou \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "O nome de tecla %s non é válido"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Debe especifica-la función para asociar á tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, 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:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "A función '%s' non existe no menú '%s'"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Síntoo, a combinación \"%s\" non se pode restablecer"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro expandindo %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "A cor de fondo \"%s\" non pode ser relucinte"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "A instrución '%s' require ir precedida do comando 'syntax'"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Falla a expresión regular despois da instrución '%s'"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr ""
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "A sintaxe \"default\" non toma a expresión regular '%s'"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, fuzzy, c-format
 msgid "Missing argument after '%s'"
 msgstr "Falla a instrución despois de '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "O argumento '%s' ten un \" sen pechar"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2249,59 +2286,59 @@ msgstr ""
 "Se o precisa, use nano coa opción -I se precisa axeita-la súa configuración "
 "no nanorc\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Non se puido atopar sintaxe \"%s\" para extender"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Opción non atopada"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción descoñecida \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Non se pode desactivar opción \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
@@ -2363,239 +2400,252 @@ msgstr "Non hai delimitador"
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marca activada"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marca desactivada"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Os comentarios non están soportados por este tipo de arquivo"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Non se pode comentar alen do final do arquivo"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Buffer para desfacer baleiro"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "engadir texto"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "ruptura de liña"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "borrar texto"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "In Selección:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "unir liña"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "substituir texto"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Editar unha substitución"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "cortar texto"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "repór texto"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "inserir texto"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Autosangría"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Autosangría"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "comentario"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "descomentar"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Desfíxose a acción (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nada para refacer"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Cadea de cita %s incorrecta: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "¡Agora pode De-Xustificar!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2606
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Xustificar todo o ficheiro"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Xustifica-lo parágrafo actual"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "A palabra non se atopa: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Verba Seguinte..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Erro ó chamar \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ó chamar \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Non hai definido analizador para este tipo de ficheiros"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Gravar o buffer modificado antes da análise"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Invocando analizador de sintaxe, por favor, espere"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Atopáronse 0 liñas analizables pola directiva: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "No comenzo da mensaxe"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "No final da mensaxe"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrada Literal"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Non hai parella do delimitador"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "¡A nano esgotóuselle a memoria!"
@@ -2622,76 +2672,81 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Secuencia descoñecida"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrada Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Modo restrinxido"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "liña %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "os moitos tradutores e o TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
@@ -2726,12 +2781,21 @@ msgstr "¡Gracias por usar nano!"
 #~ "á localización preferente (%s)\n"
 #~ "(lea no FAQ de nano sobre este cambio)"
 
+#~ msgid "Uncut Text"
+#~ msgstr "RepórTexto"
+
+#~ msgid "Unjustify"
+#~ msgstr "DeXustif"
+
 #~ msgid "WhereIs Next"
 #~ msgstr "U-lo Seguint"
 
 #~ msgid "Exit from nano"
 #~ msgstr "Saír de nano"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Desfacer corte do buffer de cortado na liña actual"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "Repeti-la última busca"
 
@@ -2753,6 +2817,9 @@ msgstr "¡Gracias por usar nano!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Uso dunha liña máis para editar"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Desprazar mainamente"
+
 #~ msgid "Backup files"
 #~ msgstr "Facer copia de seguridade de ficheiros"
 
@@ -2771,6 +2838,12 @@ msgstr "¡Gracias por usar nano!"
 #~ msgid "Start at line LINE, column COLUMN"
 #~ msgstr "Empezar na liña LIÑA, columna COLUMNA"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Non engadir novas liñas ó final dos ficheiros"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Usar un ou máis liñas para editar"
+
 #~ msgid "Quoting string"
 #~ msgstr "Cadea de citado"
 
@@ -2781,6 +2854,9 @@ msgstr "¡Gracias por usar nano!"
 #~ msgstr ""
 #~ "Iñorar silenciosamente cuestións de inicio como errores no ficherio rc"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Establecer punto de corte forte na columna #cols"
+
 #~ msgid "Reading from stdin, ^C to abort\n"
 #~ msgstr "Lendo dende a stdin, ^C para abortar\n"
 
@@ -2817,10 +2893,25 @@ msgstr "¡Gracias por usar nano!"
 #~ "\n"
 #~ "Prema Enter para seguir iniciando nano.\n"
 
+#~ msgid "text add"
+#~ msgstr "engadir texto"
+
+#~ msgid "text delete"
+#~ msgstr "borrar texto"
+
+#~ msgid "text cut"
+#~ msgstr "cortar texto"
+
+#~ msgid "text uncut"
+#~ msgstr "repór texto"
+
 #~ msgid "Internal error: line is missing.  Please save your work."
 #~ msgstr ""
 #~ "Erro interno: non podo atopar a liña. Por favor, grave o seu traballo "
 
+#~ msgid "text replace"
+#~ msgstr "substituir texto"
+
 #~ msgid "Internal error: unknown type.  Please save your work."
 #~ msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
 
@@ -2829,6 +2920,12 @@ msgstr "¡Gracias por usar nano!"
 #~ "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
 #~ "seu traballo."
 
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Cadea de cita %s incorrecta: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "¡Agora pode De-Xustificar!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Chamar ó corrector ortográfico, agarde, por favor"
 
diff --git a/po/hr.po b/po/hr.po
@@ -1,14 +1,18 @@
-# Croatian translation of nano.
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Croatian translations of nano messages.
+# Copyright (C) 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+# Permission is granted to freely copy and distribute
+# this file and modified versions, provided that this
+# header is not removed and modified versions are marked
+# as such.
 #
-# Božidar Putanec <bozidarp@yahoo.com>, 2016-2018.
+# Božidar Putanec <bozidarp@yahoo.com>, 2016-2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-3.2-pre1\n"
+"Project-Id-Version: nano-4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-06 12:54-0800\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-19 11:11-0700\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -18,7 +22,9 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\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 2.2\n"
+"X-Generator: Lokalize 2.0\n"
+"X-Poedit-Basepath: ../sources/nano\n"
+"X-Poedit-SearchPath-0: .\n"
 
 # To je 'top' direktorij, više se ne može
 #: src/browser.c:67
@@ -30,13 +36,13 @@ msgstr "Nije moguće otvoriti direktorij: %s"
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:228
 msgid "Go To Directory"
-msgstr "u Direktorij"
+msgstr "Otvori (uđe u) direktorij"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
-msgstr "Otkazano"
+msgstr "Operacija je prekinuta"
 
 #. TRANSLATORS: This refers to the confining effect of the
 #. * option --operatingdir, not of --restricted.
@@ -50,9 +56,9 @@ msgstr "Nije moguće ići izvan %s"
 msgid "Can't move up a directory"
 msgstr "Nije moguće ići iznad ovog direktorija"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Greška pri čitanju %s: %s"
@@ -81,7 +87,7 @@ msgstr "(golem)"
 #. TRANSLATORS: This is the main search prompt.
 #: src/browser.c:682 src/search.c:103
 msgid "Search"
-msgstr "Pretraži"
+msgstr "Traži"
 
 #: src/browser.c:683 src/search.c:107
 msgid " [Backwards]"
@@ -90,7 +96,7 @@ msgstr " [unatrag]"
 # ‘uokrug’ može značiti bilo koji smjer traženja
 #: src/browser.c:722 src/browser.c:727 src/search.c:285
 msgid "Search Wrapped"
-msgstr "Pretraga ide naokolo"
+msgstr "Pretraga se nastavlja odavde"
 
 # ‘nalaz’ je što pretraga nađe, a nađe ‘uzorak’;
 #: src/browser.c:738 src/search.c:418
@@ -99,22 +105,22 @@ msgstr "To je jedini nalaz"
 
 #: src/browser.c:784 src/search.c:359
 msgid "No current search pattern"
-msgstr "Nema uzorka za pretragu"
+msgstr "Za sada nema nijednog uzorka za pretragu"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nepoznato ime sintakse: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
-msgstr "magic_load() nije uspio: %s"
+msgstr "magic_load() nije uspjela: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
-msgstr "magic_file(%s) nije uspio: %s"
+msgstr "magic_file(%s) nije uspjela: %s"
 
 #: src/files.c:45
 #, c-format
@@ -145,12 +151,12 @@ msgstr "Direktorij „%s“ ne dopušta pisanje"
 #. TRANSLATORS: Keep the next eight messages at most 76 characters.
 #: src/files.c:186
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr "Nije moguće odrediti korisnika zaključane datoteke (greška getpwuid())"
+msgstr "Nije moguće odrediti vlastiti identitet za zaključanu datoteku"
 
 #: src/files.c:195
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "Nije moguće odrediti ime računala za zaključanu datoteku: %s"
+msgstr "Nije moguće odrediti hostname za zaključanu datoteku: %s"
 
 #: src/files.c:215 src/files.c:224 src/files.c:262 src/files.c:269
 #, c-format
@@ -195,7 +201,7 @@ msgstr "„%s“ nije normalna datoteka"
 
 #: src/files.c:526 src/files.c:548 src/files.c:572 src/files.c:590
 msgid "spelling correction"
-msgstr "popravljanje pravopisa"
+msgstr "popravljanje pravopisnih pogreška"
 
 #. TRANSLATORS: first %s is file name, second %s is file format.
 #: src/files.c:623
@@ -206,7 +212,7 @@ msgstr[0] "%s -- %zu redak (%s)"
 msgstr[1] "%s -- %zu retka (%s)"
 msgstr[2] "%s -- %zu redaka (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Novi međuspremnik"
 
@@ -228,45 +234,45 @@ msgstr[2] "%s -- %zu redaka"
 
 #: src/files.c:640
 msgid "No more open file buffers"
-msgstr "Nema više otvorenih međuspremnika"
+msgstr "Otvoren je samo jedan međuspremnik"
 
 #: src/files.c:933
 #, c-format
 msgid "File '%s' is unwritable"
-msgstr "Datoteku „%s“ nije moguće zapisati"
+msgstr "Datoteku „%s“ nije moguće zapisati (nije zapisiva)"
 
 #. TRANSLATORS: Keep the next four messages at most 78 characters.
 #: src/files.c:937
 #, c-format
 msgid "Read %zu line (Converted from DOS and Mac format)"
 msgid_plural "Read %zu lines (Converted from DOS and Mac format)"
-msgstr[0] "Učitano: %zu redak (pretvorenih iz DOS i Mac formata)"
-msgstr[1] "Učitano: %zu retka (pretvorenih iz DOS i Mac formata)"
-msgstr[2] "Učitano: %zu redaka (pretvorenih iz DOS i Mac formata)"
+msgstr[0] "Učitan je %zu redak (pretvoren iz DOS i Mac formata)"
+msgstr[1] "Učitano je %zu retka (pretvorenih iz DOS i Mac formata)"
+msgstr[2] "Učitano je %zu redaka (pretvorenih iz DOS i Mac formata)"
 
 #: src/files.c:942
 #, c-format
 msgid "Read %zu line (Converted from Mac format)"
 msgid_plural "Read %zu lines (Converted from Mac format)"
-msgstr[0] "Učitano: %zu redak (pretvorenih iz Mac formata)"
-msgstr[1] "Učitano: %zu retka (pretvorenih iz Mac formata)"
-msgstr[2] "Učitano: %zu redaka (pretvorenih iz Mac formata)"
+msgstr[0] "Učitan je %zu redak (pretvorenih iz Mac formata)"
+msgstr[1] "Učitano je %zu retka (pretvorenih iz Mac formata)"
+msgstr[2] "Učitano je %zu redaka (pretvorenih iz Mac formata)"
 
 #: src/files.c:947
 #, c-format
 msgid "Read %zu line (Converted from DOS format)"
 msgid_plural "Read %zu lines (Converted from DOS format)"
-msgstr[0] "Učitano: %zu redak (pretvorenih iz DOS formata)"
-msgstr[1] "Učitano: %zu retka (pretvorenih iz DOS formata)"
-msgstr[2] "Učitano: %zu redaka (pretvorenih iz DOS formata)"
+msgstr[0] "Učitan je %zu redak (pretvorenih iz DOS formata)"
+msgstr[1] "Učitano je %zu retka (pretvorenih iz DOS formata)"
+msgstr[2] "Učitano je %zu redaka (pretvorenih iz DOS formata)"
 
 #: src/files.c:953
 #, c-format
 msgid "Read %zu line"
 msgid_plural "Read %zu lines"
-msgstr[0] "Učitano: %zu redak"
-msgstr[1] "Učitano: %zu retka"
-msgstr[2] "Učitano: %zu redaka"
+msgstr[0] "Učitan je %zu redak"
+msgstr[1] "Učitano je %zu retka"
+msgstr[2] "Učitano je %zu redaka"
 
 #: src/files.c:988
 msgid "New File"
@@ -284,842 +290,842 @@ msgstr "„%s“ je uređaj"
 
 #: src/files.c:1021
 msgid "Reading File"
-msgstr "Učitavanje datoteke"
+msgstr "Datoteka se učitava"
 
 #. TRANSLATORS: The next six messages are prompts.
 #: src/files.c:1087
 msgid "Command to execute in new buffer"
-msgstr "U novom međuspremniku izvrši naredbu"
+msgstr "Naredba koju treba izvršiti u novom međuspremniku"
 
 #: src/files.c:1090
 msgid "Command to execute"
-msgstr "Izvrši naredbu"
+msgstr "Naredba koju treba izvršiti"
 
 #: src/files.c:1098
 #, c-format
 msgid "File to read unconverted into new buffer [from %s]"
-msgstr "Datoteka za učitati u novi međuspremnik bez pretvaranja [iz %s]"
+msgstr "Učita u novi međuspremnik datoteku (nepretvorenu) [iz %s]"
 
 #: src/files.c:1101
 #, c-format
 msgid "File to read into new buffer [from %s]"
-msgstr "Datoteku za učitati u novi međuspremnik [iz %s]"
+msgstr "Učita u novi međuspremnik datoteku [iz %s]"
 
 #: src/files.c:1106
 #, c-format
 msgid "File to insert unconverted [from %s]"
-msgstr "Datoteka za umetnuti bez pretvaranja [iz %s]"
+msgstr "Umetne datoteku (nepretvorenu) [iz %s]"
 
 #: src/files.c:1109
 #, c-format
 msgid "File to insert [from %s]"
-msgstr "Datoteku za umetnuti [iz %s]"
+msgstr "Umetne datoteku [iz %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Nevaljani radni direktorij\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Nevaljani radni direktorij: %s\n"
 
 # backup file = kopija datoteke, ukratko kopija
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
-"Osiguranje nije uspjelo; nastaviti sa spremanjem? (N ako niste sigurni) "
+"Osiguranje nije uspjelo; ipak nastaviti sa spremanjem? (N ako niste sigurni) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Nevaljani direktorij za osiguranje\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Nevaljani direktorij za osiguranje (backup): %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nije moguće pisati izvan %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Greška pri zapisivanju sigurnosne datoteke %s: %s"
+msgstr "Greška pri pisanju sigurnosne datoteke %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
-msgstr "Ima li previše sigurnosnih datoteka?"
+msgstr "Ima li možda previše sigurnosnih datoteka?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Greška pri zapisivanju privremene datoteke: %s"
+msgstr "Greška pri pisanju privremene datoteke: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Greška pri zapisivanju %s: %s"
+msgstr "Greška pri pisanju %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
-msgstr[0] "Zapisano: %zu redak"
-msgstr[1] "Zapisano: %zu retka"
-msgstr[2] "Zapisano: %zu redaka"
+msgstr[0] "Zapisan je: %zu redak"
+msgstr[1] "Zapisana su: %zu retka"
+msgstr[2] "Zapisano je: %zu redaka"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
-msgstr " [DOS format]"
+msgstr " [u DOS formatu]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
-msgstr " [Mac format]"
+msgstr " [u Mac formatu]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Osiguranje]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
-msgstr "Odabrani tekst umetne na vrh datoteke"
+msgstr "Odabir umetne na početak datoteke"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
-msgstr "Odabrani tekst umetne na dno datoteke"
+msgstr "Odabir pripoji na kraj datoteke"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
-msgstr "Odabrani tekst zapisati u datoteku"
+msgstr "Odabir zapisati u datoteku"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
-msgstr "Umetne na vrh datoteke"
+msgstr "Umetne na početak datoteke"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
-msgstr "Umetne na dno datoteke"
+msgstr "Pripoji na kraj datoteke"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
-msgstr "Naziv datoteke za spremiti"
+msgstr "Spremi u datoteku"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
-msgstr "Premaleno"
+msgstr "Premali"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
-msgstr "Datoteka postoji -- nije moguće pisati preko nje"
+msgstr "Datoteka postoji -- nije ju moguće prekopisati (overwrite)"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
-msgstr "Spremiti datoteku pod DRUGIM NAZIVOM? "
+msgstr "Spremiti datoteku pod DRUGIM IMENOM? "
 
 # overwrite: prepisati preko, prebrisati
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
-msgstr "Datoteka „%s“ već postoji; PREPISATI preko nje? "
+msgstr "Datoteka „%s“ postoji; PREKOPISATI ju? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
-msgstr "Datoteka na disku se promijenila"
+msgstr "Promijenila se datoteka na disku"
 
 # Nešto izvan nana je promijenilo datoteku na disku. nano pita da li da piše preko promijenjenje datoteke
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
-msgstr "Datoteka je promijenjena nakon otvaranja; nastaviti sa spremanjem? "
+msgstr ""
+"Datoteka je promijenjena nakon otvaranja; ipak nastaviti sa spremanjem? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(više)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
-msgstr "Izlaz"
+msgstr "Završi"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Zalijepi"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "odPoravna"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
-msgstr "odustajete -- prekidate ovu operaciju"
+msgstr "odustajete od ove operacije"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
-msgstr "ova prikazana pomoć"
+msgstr "ova pomoć koju sad čitate"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
-msgstr "zatvori ovaj međuspremnik / zatvarate nano"
+msgstr "zatvara (ovaj) međuspremnik / završite (zatvorite) nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
-msgstr "zapiše ovaj međuspremnik (ili označeni tekst) na disk"
+msgstr "zapiše (ovaj) međuspremnik (ili označeni tekst) na disk"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
-msgstr "datoteku umetne u ovaj ili u novi međuspremnik"
+msgstr "datoteku umetne u (ovaj ili u novi) međuspremnik"
 
 # regularni izraz u dalnjem textu regiz ako je ograničen broj znakova
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
-msgstr "traži (unaprijed) string ili regularni izraz (regiz)"
+msgstr "traži unaprijed string ili regularni izraz (regex)"
 
 # regularni izraz u dalnjem textu regiz ako je ograničen broj znakova
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
-msgstr "traži (unatrag) string ili regularni izraz (regiz)"
+msgstr "traži unatrag string ili regularni izraz (regex)"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "traži string unaprijed"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "traži string unatrag"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
-msgstr "osvježi popis datoteka"
+msgstr "ažurira popis datoteka"
 
 # redak, stupac su brojevi
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
-msgstr "ode na lijevi stupac"
+msgstr "na lijevi stupac"
 
 # redak, stupac su brojevi
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
-msgstr "ode na desni stupac"
+msgstr "na desni stupac"
 
 # redak, stupac su brojevi
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
-msgstr "ode u prvi red ovog stupca"
+msgstr "na prvi red ovog stupca"
 
 # redak, stupac su brojevi
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
-msgstr "ode u zadnji red ovog stupca"
+msgstr "na zadnji red ovog stupca"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
-msgstr "za cijeli prozor gore (Page Up)"
+msgstr "za cijeli prozor klizne gore (Page Up)"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
-msgstr "za cijeli prozor dolje (Page Down)"
+msgstr "za cijeli prozor klizne dolje (Page Down)"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "redak (ili označene retke) izreže i spremi u izreži-spremnik"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "zalijepi sadržaj izreži-spremnika u ovaj redak"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "ubaci sadržaj izreži-spremnika na trenutačnu poziciju kursora"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "pokaže trenutačnu poziciju kursora"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
-msgstr "pozove provjeru pravopisa (ako je dostupna)"
+msgstr "pozove provjeru pravopisa (spell checker ako je dostupan)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
-msgstr "zamijeni string ili regularni izraz (regiz)"
+msgstr "zamijeni string ili regularni izraz (regex)"
 
 # redak, stupac su brojevi
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
-msgstr "ode u dani redak i stupac"
+msgstr "kursor skoči u zatraženi redak (i stupac)"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "označi tekst počevši od pozicije kursora"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
-msgstr "kopira ovaj redak (ili označeni tekst) i spremi u izreži-spremnik"
+msgstr "kopira (ovaj) redak ili označeni tekst u izreži-spremnik"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
-msgstr "odbacuje ovaj redak (ili označene retke)"
+msgstr "odbaci (ovaj) redak (ili označene retke)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
-msgstr "izvuče ovaj redak (ili označene retke)"
+msgstr "izvuče (ovaj) redak (ili označene retke)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
-msgstr "uvuče ovaj redak (ili označene retke)"
+msgstr "uvuče (ovaj) redak (ili označene retke)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "poništi zadnju operaciju (vrati na prethodno stanje)"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "ponovi zadnju poništenu operaciju"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
-msgstr "jedan znak unazad"
+msgstr "za znak natrag"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
-msgstr "jedan znak naprijed"
+msgstr "za znak naprijed"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
-msgstr "jednu riječ unazad"
+msgstr "za riječ natrag"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
-msgstr "jednu riječ naprijed"
+msgstr "za riječ naprijed"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "na prethodni redak"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "na sljedeći redak"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "na početak ovog retka"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "na kraj ovog retka"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "na prethodni blok teksta"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "na sljedeći blok teksta"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "na početak ovoga odlomka; zatim na početak prethodnoga..."
+msgstr "na početak ovoga odlomka; zatim na početak prethodnoga"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "na svršetak ovoga odlomka; zatim na svršetak sljedećega..."
+msgstr "na svršetak ovoga odlomka; zatim na svršetak sljedećega"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
-msgstr "na prvi redak datoteke"
+msgstr "na prvi redak teksta"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
-msgstr "na zadnji redak datoteke"
+msgstr "na zadnji redak teksta"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "skoči na odgovarajuću zagradu"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
-msgstr "prozor gore za jedan redak (kursor ostaje u istom retku)"
+msgstr "prozor gore za jedan redak (kursor ostane u istom retku)"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
-msgstr "prozor dolje za jedan redak (kursor ostaje u istom retku)"
+msgstr "prozor dolje za jedan redak (kursor ostane u istom retku)"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
-msgstr "na prethodni međuspremnik"
+msgstr "na prethodni datotečni međuspremnik"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
-msgstr "na sljedeći međuspremnik"
+msgstr "na sljedeći datotečni međuspremnik"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
-msgstr "doslovno umetne sljedeću otipkanu sekvenciju"
+msgstr "Slijedeću sekvenciju tipki unese doslovno"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "unese tab(ulator) na poziciji kursora"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
-msgstr "prelomi redak na poziciju kursora i ode u novi redak"
+msgstr "prelomi redak na poziciji kursora"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
-msgstr "briše znak ispod kursora"
+msgstr "izbriše znak ispod kursora"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
-msgstr "briše znak nalijevo od kursora"
+msgstr "izbriše znak nalijevo od kursora"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "izreže unatrag od kursora do početka riječi"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "izbriše unatrag od kursora do početka riječi"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "izreže unaprijed od kursora do početka sljedeće riječi"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "izbriše unaprijed od kursora do početka sljedeće riječi"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
-msgstr "izreže sve od kursora do dna datoteke"
+msgstr "izreže sve od kursora do dna teksta"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
-msgstr "poravna ovaj odlomak"
+msgstr "poravna (ovaj) odlomak"
 
 # poravnanje djeluje na ukupnu datoteku
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
-msgstr "poravna cijelu datoteku"
+msgstr "poravna sav tekst"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "izbroji broj riječi, redova i znakova"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
-msgstr "osvježi (ponovno iscrta) prozor"
+msgstr "obnovi (ponovno iscrta) prozor"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "obustavi uređivanje teksta (ako je obustava omogućena)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
-msgstr "pokuša dovršiti trenutačnu riječ"
+msgstr "pokuša dovršiti (ovu) riječ"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
-msgstr "komentira/odkomentira ovaj redak (ili označene retke)"
+msgstr "komentira/razkomentira (ovaj) redak (ili označene retke)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
-msgstr "spremi datoteku bez pitanja (bez prompta)"
+msgstr "spremi u datoteku bez pitanja"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "traži unatrag sljedeći nalaz uzorka"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "traži unaprijed sljedeći nalaz uzorka"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "započne/zaustavi snimanje makroa"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "pokrene zadnji snimljeni makro"
 
 # toggle: smisao rečenice govori da je to 'šalter'; slično za večinu 'toggle' naredbi
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
-msgstr "razlikovati VELIKA i mala slova u pretrazi?  Da/Ne"
+msgstr "Razlikovati mala od VELIKIH slova u pretrazi?  Da/Ne"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
-msgstr "obrne smjer traženja"
+msgstr "promijeni smjer traženja"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
-msgstr "koristiti regularni izraz (regiz) u pretrazi?  Da/Ne"
+msgstr "Koristiti regularne izraze (regex) u pretrazi?  Da/Ne"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
-msgstr "prethodni string za pretragu/zamjenu"
+msgstr "predloži raniji uzorak/tekst za pretragu/zamjenu"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
-msgstr "sljedeći string za pretragu/zamjenu"
+msgstr "predloži noviji uzorak/tekst za pretragu/zamjenu"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS format?  Da/Ne"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac format?  Da/Ne"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
-msgstr "dodati (tekst) na dno datoteke?  Da/Ne"
+msgstr "Pripojiti na kraj?  Da/Ne"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
-msgstr "umetnuti (tekst) na vrh datoteke?  Da/Ne"
+msgstr "Umetnuti na početak?  Da/Ne"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
-msgstr "osigurati originalne datoteke?  Da/Ne"
+msgstr "Osigurati originalne datoteke?  Da/Ne"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "izvrši vanjsku naredbu"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
-msgstr "kroz cijev pošalje međuspremnik (ili označeni tekst) na naredbu"
+msgstr "sadržaj međuspremnika / označeni tekst preda kroz cijev naredbi"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
-msgstr "ne pretvarati iz DOS/Mac formata"
+msgstr "Pretvoriti iz DOS/Mac formata?  Da/Ne"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
-msgstr "upotrijebiti novi međuspremnik?  Da/Ne"
+msgstr "Učitati u novi međuspremnik?  Da/Ne"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
-msgstr "zatvori međuspremnik bez da ga spremi"
+msgstr "zatvori međuspremnik bez spremanja"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
-msgstr "otvori popis datoteka"
+msgstr "otvori preglednik datoteka"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
-msgstr "napusti popis datoteka"
+msgstr "izlaz iz preglednika datoteka"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
-msgstr "na prvu datoteku na popisu"
+msgstr "na prvu datoteku u popisu"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
-msgstr "na zadnju datoteku na popisu"
+msgstr "na zadnju datoteku u popisu"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
-msgstr "na prethodnu datoteku na popisu"
+msgstr "na prethodnu datoteku u popisu"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
-msgstr "na sljedeću datoteku na popisu"
+msgstr "na sljedeću datoteku u popisu"
 
 # Prompt za odabir direktorija
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "otvori uneseni direktorij"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
-msgstr "pozove linter (alat) ako je dostupni"
+msgstr "pozove linter (alat) ako je dostupan"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
-msgstr "prethodna poruka lintera"
+msgstr "na raniju poruku lintera"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
-msgstr "sljedeća poruka lintera"
+msgstr "na kasniju poruku lintera"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Pomoć"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Odustajem"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Spremi"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
-msgstr "Učita datoteku"
+msgstr "Otvori"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Poravna"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
-msgstr "Osvježi"
+msgstr "Obnovi"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
-msgstr "Pretraži"
+msgstr "Traži"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Zamijeni"
 
 # Direktorij je dosta, jer je jasno iz konteksta a ima i pomoćni tekst
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
-msgstr "u Direktorij"
+msgstr "U direktorij"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
-msgstr "Izreži"
+msgstr "Izreže"
+
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Zalijepi tekst"
 
-#: src/global.c:781
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Pravopis"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pozicija"
 
 # 'Go to' se najčešće izbjegava; koristi se imenička konstrukcija jasna iz konteksta
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
-msgstr "u Redak"
+msgstr "U redak?"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Poništi"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Ponovi"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Označi tekst"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopira"
 
 # razlikovanje malih od velikih slova
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Slova?!"
 
 # regexp: regularni izraz > regizr ?
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
-msgstr "Reg izraz"
+msgstr "Regex"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
-msgstr "Unatrag"
+msgstr "Unatrag traži"
 
 # Ne zamijeni? bolje Ne mijenjaj?
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Traži"
 
-#: src/global.c:823
+# raniji, noviji jer je smisao vremenski, nije prostorni
+#: src/global.c:815
 msgid "Older"
-msgstr "Starije"
+msgstr "Raniji uzorak"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
-msgstr "Novije"
+msgstr "Noviji uzorak"
 
 # Poravnanje=operacija ravnanja teksta tako da svi reci imaju istu udaljenost u odnosu na rubove
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "SvePoravna"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Na zagradu"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Spremi"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Traži unatrag"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
-msgstr "Prethodni"
+msgstr "Prethodni nalaz"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
-msgstr "Sljedeći"
+msgstr "Sljedeći nalaz"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Natrag"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Naprijed"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
-msgstr "Riječ ←"
+msgstr "Riječ ispred"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
-msgstr "Riječ →"
+msgstr "Riječ iza"
 
 # Pozicija 1, 1. stupac, Home
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Početak"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Kraj"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
-msgstr "Redak ↑"
+msgstr "Redak gore"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
-msgstr "Redak ↓"
+msgstr "Redak dolje"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Klizne gore"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Klizne dolje"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
-msgstr "Blok ←"
+msgstr "Blok gore"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
-msgstr "Blok →"
+msgstr "Blok dolje"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Vrh odlomka"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Dno odlomka"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
-msgstr "Prozor ↑"
+msgstr "Prozor gore"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
-msgstr "Prozor ↓"
+msgstr "Prozor dolje"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Na vrh"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Na dno"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
-msgstr "Datoteka ←"
+msgstr "Pret. datoteka"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
-msgstr "Datoteka →"
+msgstr "Slj. datoteka"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
 # izrezivanje riječi, ali gdje je shortcut?
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Reži ulijevo"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Briše ulijevo"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Reži udesno"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Briše udesno"
 
 # izrezivanje riječi, ali gdje je shortcut?
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
-msgstr "RežiDoKraja"
+msgstr "BrišeOstatak"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Broj riječi"
 
 # verbatim: doslovce, bukvalno,
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Doslovno"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Obustavi"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Uvlačenje"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Izvlačenje"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Komentira retke"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Kompletirano"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Snimanje"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Pokrene makro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
-msgstr "Obriši tekst"
+msgstr "Odbaci tekst"
 
-# lintanje, čišćenje koda
-#: src/global.c:997
+# lintanje, čišćenje kȏda
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Spremi"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Traži"
@@ -1134,12 +1140,12 @@ msgstr "Mac format"
 
 #: src/global.c:1023
 msgid "Append"
-msgstr "Doda iza"
+msgstr "Pripoji na kraj"
 
 # dodaj, metni
 #: src/global.c:1025
 msgid "Prepend"
-msgstr "Umetne ispred"
+msgstr "Umetne na početak"
 
 #: src/global.c:1028
 msgid "Backup File"
@@ -1155,11 +1161,11 @@ msgstr "Izvrši naredbu"
 
 #: src/global.c:1047
 msgid "Pipe Text"
-msgstr "Pošalje tekst naredbi"
+msgstr "Proslijedi tekst naredbi"
 
 #: src/global.c:1057
 msgid "To Files"
-msgstr "Popis datoteka"
+msgstr "Preglednik datoteka"
 
 #: src/global.c:1065
 msgid "First File"
@@ -1192,70 +1198,70 @@ msgstr "Odbaci međuspremnik"
 #. TRANSLATORS: Try to keep the next two strings at most 20 characters.
 #: src/global.c:1086
 msgid "Prev Lint Msg"
-msgstr "Linter poruka ↑"
+msgstr "Ranija lint poruka"
 
 # linter alat za provjeru sintakse za neke programe
 #: src/global.c:1088
 msgid "Next Lint Msg"
-msgstr "Linter poruka ↓"
+msgstr "Novija lint poruka"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
-msgstr "Stalni prikaz pomoći u dva posljednja retka prozora?"
+msgstr "Pomoć u zadnja dva retka prozora?"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Pozicija kursora uvijek vidljiva?"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Glatko klizanje?"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Skokovito klizanje (pa pola prozora)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Meko prelamanje predugih redova?"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Bjelina uvijek vidljiva?"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Sintaksu istaknuti bojama?"
 
 # pometna Home tipka: prvi skok na prvi znak, zatim na poziciju 1
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Pametna Home tipka?"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatsko uvlačenje?"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Izrezivanje do kraja retka?"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Tvrdo prelamanje predugih redova?"
 
 # Tab znak pretvara u razmake
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
-msgstr "Tab(ulatore) pretvarati u razmake?"
+msgstr "Tipkane „Tab“-ove prevesti u razmake?"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Podrška za miša?"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Privremena obustava?"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numeracija redaka?"
 
@@ -1272,15 +1278,15 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"===  Pretraga i zamjena ===\n"
+"===  Pretraživanje i zamjena  ===\n"
 "\n"
 " Upišite uzorak (riječ(i), dio riječi ili znakove) koji želite naći, zatim "
-"pritisnite Enter.  Ako se uzorak pronađe, prozor će se osvježiti da pokaže "
-"prvi nalaz uzorka.\n"
+"pritisnite Enter. Ako se uzorak pronađe, kursor će skočiti i pokazati prvi "
+"najbliži nalaz uzorka.\n"
 "\n"
-" Prethodni uzorak za pretragu ostati će prikazan u uglatim zagradama iza "
-"prompta „Pretraži“.  Pritisnete li Enter, a da niste upisali novi uzorak za "
-"pretragu, ponovit će se pretraga s prethodnim uzorkom.  "
+" Prethodni uzorak za pretragu ostat će prikazan u uglatim zagradama iza "
+"prompta „Traži“. Pritisnete li Enter, a da niste upisali novi uzorak za "
+"pretragu, ponovit će se pretraga s tim uzorkom.  "
 
 #: src/help.c:308
 msgid ""
@@ -1293,7 +1299,7 @@ msgstr ""
 "Ako ste označili i odabrali tekst i nakon toga započnete pretragu za "
 "zamjenu, samo će nalazi uzorka u odabranom tekstu biti zamijenjeni.\n"
 "\n"
-" Sljedeće tipke i sekvencije su vam na raspolaganju za „Pretraži“\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „Traži“\n"
 "\n"
 
 #: src/help.c:314
@@ -1307,16 +1313,17 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"===  u Redak  ===\n"
+"===  U redak? (pozicija u tekstu)  ===\n"
 "\n"
-" Upišite broj retka (, broj stupca) u koji želite otići te pritisnite "
-"Enter.  Ako je broj redaka u tekstu manji od tog broja, otići ćete u zadnji "
+" Upišite broj retka (, broj stupca) na koji želite skočiti te pritisnite "
+"Enter. Ako tekst ima manje redaka od tog broja, kursor će skočiti na zadnji "
 "redak teksta (dno teksta).\n"
 "\n"
-" Sljedeće tipke i prečaci su vam na raspolaganju za „u Redak“:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „U redak?“:\n"
 "\n"
 
-# upisati > to je samo pisati; unesti > to je upisati + Eneter
+# upisati > to je samo pisati
+# unesti > to je upisati + Enter
 #: src/help.c:323
 msgid ""
 "Insert File Help Text\n"
@@ -1329,9 +1336,9 @@ 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 ""
-"===  Učitavanje i umetanje datoteke  ===\n"
+"===  Otvaranje, učitavanje i umetanje datoteka  ===\n"
 "\n"
-" Unesite naziv datoteke koju treba umetnuti u ovaj međuspremnik na "
+" Unesite ime datoteke koju želite umetnuti u trenutačni međuspremnik na "
 "trenutačnoj poziciji kursora.\n"
 "\n"
 " Ako ste sastavili (compiled) nano s podrškom za višestruke međuspremnike i "
@@ -1350,7 +1357,7 @@ msgstr ""
 "Ako vam treba novi (prazni) međuspremnik, onda nemojte ništa upisati nego "
 "samo samo pritisnite tipku Enter.\n"
 "\n"
-" Sljedeće tipke i prečaci su vam na raspolaganju za „Učita datoteku“„:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „Otvori“:\n"
 "\n"
 
 #: src/help.c:338
@@ -1368,17 +1375,17 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"===  Spremanje datoteke  ===\n"
+"===  Spremanje teksta u datoteku  ===\n"
 "\n"
-" Utipkajte naziv pod kojim želite spremiti ovu datoteku te pritisnite Enter "
-"da ju spremite.\n"
+" Upišite (ili prihvatite predloženo) ime pod kojim želite spremiti "
+"trenutačni tekst te pritisnite Enter da ga spremite.\n"
 "\n"
-" Ako ste označili i odabrali tekst, nano će vam predložiti da spremite "
-"odabrani tekst kao zasebnu datoteku.  Da se smanji opasnost od slučajnog "
-"prepisivanja preko aktualne datoteke, a tek s nekim njezinim djelom (tekstom "
-"koji ste odabrali), naziv aktualne datoteke neće biti predložen.\n"
+" Ako ste označili i odabrali tekst, nano će vam predložiti da spremite vaš "
+"odabir kao zasebnu datoteku. Da se smanji opasnost od slučajnog prepisivanja "
+"preko trenutačne datoteke, a tek s nekim njezinim djelom (vašim odabirom), "
+"naziv trenutačne datoteke neće biti predložen.\n"
 "\n"
-" Sljedeće tipke i prečaci su vam na raspolaganju za „Spremi datoteku“:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „Spremi“:\n"
 "\n"
 
 #: src/help.c:352
@@ -1394,16 +1401,16 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"===  Popis datoteka  ===\n"
+"===  Preglednik datoteka  ===\n"
 "\n"
-" Popis datoteka omogućuje vam vizualno pregledavanje strukture direktorija i "
-"odabiranje datoteka za učitavanje ili zapisivanje.  Pritom možete rabiti "
-"tipke sa strelicama ili tipke Page Up/Down.  Tipkom S ili Enter možete "
-"odabrati datoteku ili otvoriti odabrani direktorij.  Za pomak u viši "
+" Preglednik datoteka koristite kao vizualni pregled strukture direktorija i "
+"za odabiranje datoteka za učitavanje ili zapisivanje. Pritom možete rabiti "
+"tipke sa strelicama ili tipke Page Up/Down. Tipkom S ili Enter možete "
+"odabrati datoteku ili otvoriti odabrani direktorij. Za pomak u viši "
 "direktorij, odaberite direktorij „..“ (viši dir) na vrhu liste i pritisnite "
 "Enter.\n"
 "\n"
-" Sljedeće tipke i prečaci su vam na raspolaganju za „Popis datoteka“:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „Preglednik“:\n"
 "\n"
 
 #: src/help.c:365
@@ -1419,15 +1426,15 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"===  Pretraživanje u popisu datoteka  ===\n"
+"===  Pretraživanje u pregledniku datoteka  ===\n"
 "\n"
-" Upišite uzorak (riječi, dio riječi ili znakove) koji želite naći, zatim "
-"pritisnite Enter.  Pronađe li se uzorak, prozor će se osvježiti i pokazati "
-"prvi nalaz uzorka.\n"
+" Upišite uzorak (ime, dio imena ili znakove) koji želite naći, zatim "
+"pritisnite Enter. Ako se uzorak pronađe, kursor će skočiti i pokazati prvi "
+"najbliži nalaz uzorka.\n"
 "\n"
-" Prethodni uzorak za pretragu će ostati prikazan u uglatim zagradama iza "
-"prompta „Pretraži“.  Ako pritisnete Enter, a da niste upisali novi uzorak za "
-"pretragu, ponoviti će se pretraga s prijašnjim uzorkom.\n"
+" Prethodni uzorak za pretragu ostat će prikazan u uglatim zagradama iza "
+"prompta „Traži“. Pritisnete li Enter, a da niste upisali novi uzorak za "
+"pretragu, ponovit će se pretraga s tim uzorkom.\n"
 "\n"
 
 #: src/help.c:374
@@ -1435,7 +1442,7 @@ msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Sljedeće tipke i prečaci su vam na raspolaganju za „Pretraži“:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „Traži“:\n"
 "\n"
 
 #: src/help.c:378
@@ -1450,14 +1457,14 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"===  u Direktorij  ===\n"
+"===  Otvaranje i pregledavanje direktorija  ===\n"
 "\n"
-" Unesite naziv direktorija koji želite pregledati.\n"
+" Unesite naziv direktorija koji želite otvoriti i pregledati.\n"
 "\n"
 " Tipku Tab možete (pokušati) iskoristiti za automatsko kompletiranje naziva "
-"direktorija ako je kompletiranje tabulatorom omogućeno.\n"
+"direktorija ako je kompletiranje s (tab)ulatorom omogućeno.\n"
 "\n"
-" Sljedeće tipke i prečaci su vam na raspolaganju za „u Direktorij“:\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju za „U direktorij“:\n"
 "\n"
 
 #: src/help.c:391
@@ -1475,11 +1482,12 @@ msgid ""
 msgstr ""
 "===  Provjera pravopisa  ===\n"
 "\n"
-" Provjera pravopisa provjerava sav tekst u ovoj datoteci.  Kad provjera "
-"naiđe na nepoznatu riječ, ta riječ se istakne i može se zamijeniti, odnosno "
-"urediti.  Provjera će nakon toga predložiti da zamijeni tu krivo napisanu "
-"riječ svaki put kad se ona pojavi u ovoj datoteci.  Ali ako ste oznakom "
-"odabrali dio teksta, onda će provjera djelovati samo u odabranom tekstu.\n"
+" Provjera pravopisa provjerava sav tekst u trenutačnoj datoteci. Kad "
+"provjera naiđe na nepoznatu riječ, ta riječ se istakne i može se zamijeniti, "
+"odnosno urediti. Provjera će nakon toga predložiti da zamijeni tu krivo "
+"napisanu riječ svaki put kad se ona pojavi u ovoj datoteci. Ali ako ste "
+"oznakom odabrali dio teksta, onda će provjera djelovati samo u odabranom "
+"tekstu.\n"
 "\n"
 " Sljedeće tipke i prečaci su vam na raspolaganju za „Pravopis“:\n"
 "\n"
@@ -1495,10 +1503,10 @@ msgid ""
 msgstr ""
 "===  Vanjska naredba  ===\n"
 "\n"
-" Ovdje možete umetnuti ispis naredbe vašeg operacijskog sustava u ovaj "
-"međuspremnik (ili u novi međuspremnik).  Ako se ispred naredbe upiše "
-"„|“ (simbol cijevi), naredbi će biti poslan trenutačni sadržaj međuspremnika "
-"(ili označeni tekst)."
+" Ovdje možete unijeti naredbu ljuske čiji izlaz želite umetnuti u trenutačni "
+"(ili učitati u novi) međuspremnik. Ako ispred naredbe upišete „|“ (simbol "
+"cijevi), poslati će te sadržaj međuspremnika (ili označeni tekst) kroz "
+"cijev.  "
 
 #: src/help.c:412
 msgid ""
@@ -1528,7 +1536,7 @@ msgstr ""
 "=== Linter ===\n"
 "\n"
 " U statusnoj traci ispisuje se poruke o greškama ili upozorenjima, a kursor "
-"ode na odgovarajuću poziciju u datoteci. Koristite PageUp i PageDown za "
+"skoči na odgovarajuću poziciju u datoteci. Koristite PageUp i PageDown za "
 "pregled ranijih ili kasnijih poruka.\n"
 "\n"
 
@@ -1554,11 +1562,10 @@ msgstr ""
 "===  Upute za uporabu  ===\n"
 "\n"
 " Nano je zamišljen tako da imitira funkcionalnost i lakoću upotrebe "
-"uređivača teksta UW Pico.  Ima četiri glavne sekcije.  Traka na vrhu "
-"pokazuje inačicu programa, naziv i stanje datoteke koja se trenutačno "
-"uređuje.  Ispod toga je glavni prozor u kojem je prikazan tekst te "
-"datoteke.  U trećem retku iznad dna je statusna traka u kojoj vam nano "
-"javlja važne poruke.  "
+"uređivača teksta UW Pico. Ima četiri glavne sekcije. Traka na vrhu pokazuje "
+"inačicu programa, naziv i stanje datoteke koja se trenutačno uređuje. Ispod "
+"toga je glavni prozor u kojem je prikazan tekst te datoteke. U trećem retku "
+"iznad dna je traka stanja u kojoj vam nano javlja važne poruke.  "
 
 #: src/help.c:439
 msgid ""
@@ -1569,15 +1576,15 @@ msgid ""
 "twice.  Meta-key sequences are notated with 'M-' and can be entered using "
 "either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
 msgstr ""
-"U posljednjim dvama redcima prikazane su najčešće upotrebljavane sekvencije "
-"tipaka (prečaci) uređivača.  Termini prečac, sekvencija ili tipka su "
-"zamjenjivi i koriste se ovisno o kontekstu.\n"
+"U posljednjim dvama redcima prikazane su najčešće upotrebljavane kombinacije "
+"tipaka (prečaci) uređivača. Termini prečac, sekvencija ili kombinacija tipki "
+"su zamjenjivi i koriste se ovisno o kontekstu.\n"
 "\n"
-" Notacija prečaca jest: sekvencije s tipkom Control započinju sa simbolom "
+" Notacija prečaca jest: prečaci s tipkom Control započinju sa simbolom "
 "„caret“ (^) koji se unosi upotrebom tipke Ctrl ili dvama uzastopnim "
-"pritiscima tipke Esc.  Sekvencije s tipkom Meta započinju s (M-) simbolom "
-"koji se unosi upotrebom tipke Alt, ili tipke Cmd, ili tipke Esc ovisno o "
-"vašoj tipkovnici.  "
+"pritiscima tipke Esc. Prečaci s tipkom Meta započinju s (M-) simbolom koji "
+"se unosi upotrebom tipke Alt, ili tipke Cmd, ili tipke Esc ovisno o vašoj "
+"tipkovnici.  "
 
 # sekvencije tipaka = naredbe
 #: src/help.c:446
@@ -1590,10 +1597,11 @@ msgid ""
 msgstr ""
 "Dva uzastopna pritiska tipke Esc i nakon toga unos troznamenkastoga "
 "decimalnog broja od 000 do 255 unijet će znak koji odgovara tom broju.  "
-"Uzastopnim pritiskom na prečac koji pita „Da/Ne“ omogućite (Da) ili "
-"onemogućite (Ne) predloženu opciju.  Sljedeće tipke i prečaci su vam na "
-"raspolaganju u glavnom prozoru uređivača. Alternativne sekvencije su "
-"navedene u zagradama:\n"
+"Uzastopnim pritiskom na prečac koji pita „Da/Ne“ odgovorom » Da « omogućite, "
+"a s odgovorom » Ne « onemogućite predloženu opciju.\n"
+"\n"
+" Sljedeće tipke i prečaci su vam na raspolaganju u glavnom prozoru "
+"uređivača.  Alternative su navedene u zagradama:\n"
 "\n"
 
 #: src/help.c:478 src/help.c:551
@@ -1616,7 +1624,7 @@ msgid ""
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 "Nije moguće napraviti direktorij %s: %s\n"
-"Nužan je za čuvanje/čitanje povijesti pretraga ili pozicije kursora.\n"
+"To je nužno za čuvanje/čitanje povijesti pretraga ili pozicije kursora.\n"
 
 #: src/history.c:290
 #, c-format
@@ -1630,22 +1638,22 @@ msgstr ""
 #: src/history.c:380 src/history.c:389 src/history.c:471 src/history.c:493
 #, c-format
 msgid "Error writing %s: %s\n"
-msgstr "Greška pri zapisivanju %s: %s\n"
+msgstr "Greška pri pisanju %s: %s\n"
 
 # Čitanje umjesto Pregledavanje
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
-msgstr "Tipka ne važi za „Čitanje“"
+msgstr "Prečac ne radi za „Čitanje“ (moguće je samo čitati i tražiti)"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
-msgstr "Ova funkcija nije dostupna u ograničenom načinu rada"
+msgstr "Ova funkcija nije dostupna u ograničenom načinu"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Pomoć nije dostupna"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1654,7 +1662,7 @@ msgstr ""
 "\n"
 "Međuspremnik je zapisan u %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1663,7 +1671,7 @@ msgstr ""
 "\n"
 "Međuspremnik nije zapisan u %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1672,7 +1680,7 @@ msgstr ""
 "\n"
 "Međuspremnik nije zapisan: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1683,7 +1691,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1691,10 +1699,10 @@ msgid ""
 msgstr ""
 "Datoteku možete otvoriti s kursorom u specifičnom retku tako da navedete "
 "broj\n"
-"retka s „+“ ispred naziva datoteke.  Broj stupca možete navesti nakon "
+"retka s „+“ ispred naziva datoteke. Broj stupca možete navesti nakon "
 "zareza.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1703,286 +1711,299 @@ msgstr ""
 "Ako je ime datoteke „-“, nano čita podatke iz standardnog ulaza.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcija\t\tGNU duga opcija\t\tZnačenje\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "pametna Home tipka"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
-msgstr "osigura sve postojeće datoteke"
+msgstr "osigura (backup) sve postojeće datoteke"
 
 # direktorij za spremanje sigurnosnih datoteka
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
 # direktorij za spremanje unikata kopija
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
-msgstr "direktorij dir za unikate osiguranja"
+msgstr "direktorij unikata osiguranja (backup)"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
-msgstr "deblja slova umjesto inverzije teksta"
+msgstr "deblja slova umjesto inverzije slova"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
-msgstr "otipkane tabulatore zamijeni razmacima"
+msgstr "tipkane tab(ulatore) prevede u razmake"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
-msgstr "datoteku učita u novi spremnik (zadano)"
+msgstr "datoteku učita u novi spremnik [zadano]"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
-msgstr "zaključane datoteke su u vim-stilu"
+msgstr "datoteke zaključa na vim način"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "vodi dnevnik pretraga/zamjena teksta"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
-msgstr "zanemari sve nanorc datoteke"
+msgstr "ignorira nanorc datoteke"
+
+# redak, stupac su brojevi
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "okomito istakne cijeli stupac <number>"
 
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
-msgstr "ukloni problem s numeričkom tipkovnicom"
+msgstr "riješi problem s num-blokom tipkovnice"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "ne dodaje novi redak krajevima datoteka"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "ne doda automatski „newline“ [zadano]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "briše zaostale bjeline nakon prelamanja"
 
-#: src/nano.c:815
-msgid "Don't convert files from DOS/Mac format"
-msgstr "ne pretvara datoteke iz DOS/Mac formata"
-
 #: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "prvi redak koristi za uređivanje"
+msgid "Don't convert files from DOS/Mac format"
+msgstr "ne mijenja format DOS/Mac datoteka"
 
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "vodi dnevnik pozicija kursora"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
-msgstr "-Q <regiz>"
+msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
-msgstr "--quotestr=<regiz>"
+msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
-msgstr "regularni izraz koji podudara citiranje"
+msgstr "izraz koji podudara navodničke znakove"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
-msgstr "ograničeni način rada"
+msgstr "ograničeni pristup datotečnom sustavu"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "kliže po redak umjesto po pola prozora"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
-msgstr "-T <#stupac>"
+msgstr "-T <broj>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#stupac>"
+msgstr "--tabsize=<broj>"
 
 # koliko razmaka je širok tabulator
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
-msgstr "širina tabulatora je #stupac"
+msgstr "širina tabulatora u stupcima je <broj>"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
-msgstr "brzo ukloni statusnu traku"
+msgstr "odmah počisti traku stanja"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
-msgstr "pokaže informaciju o inačici i iziđe"
+msgstr "pokaže informacije o inačici i iziđe"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
-msgstr "točnije otkriva granice riječima"
+msgstr "točnije otkriva granice riječi"
 
 # treba kratko, a 'znakovni niz' je predugo
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <znak>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<znak>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "ostali mogući znak(ovi) kao dio riječi"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <ime>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<ime>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "ime sintakse za isticanje bojama"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
-msgstr "Neka Bsp i Del obrišu označeno područje"
+msgstr "Backspace i Del uklone označeno područje"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
-msgstr "meko prelamanje lomi retke na bjelini"
+msgstr "kad meko prelama, prelama na bjelini"
+
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "tvrdo prelomi svaki predugački redak"
 
-#: src/nano.c:851
+#: src/nano.c:852
 msgid "Constantly show cursor position"
-msgstr "pozicija kursora uvijek prikazana"
+msgstr "pozicija kursora uvijek vidljiva"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "popravi Backspace/Delete zbrku"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "redak ispod naslova održava praznim"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "čini da tekst uvijek završi novim retkom"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
-msgstr "pokaže kursor u popisu datoteka i uputama"
+msgstr "pokaže kursor u popisu datoteka, uputama"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
-msgstr "pokaže ovu pomoć i iziđe"
+msgstr "pokaže pomoć koju sad čitate i iziđe"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "automatski uvlači nove retke"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "kliže po pola prozora, a ne po redak"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
-msgstr "izrezuje od kursora do kraja retka"
+msgstr "izreže od kursora do kraja retka"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "numeracija redaka ispred teksta"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "omogući upotrebu miša"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
-msgstr "datoteku ne učitati (samo ju zapisati)"
+msgstr "ne čita datoteku (samo ju zapiše)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "postavi dir za radni direktorij"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "sačuva sekvencije XON (^Q) i XOFF (^S)"
+msgstr "očuva prečace XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
-msgstr "-r <#stupac>"
+msgstr "-r <broj>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
-msgstr "--fill=<#stupac>"
+msgstr "--fill=<broj>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "tvrdo prelama na stupcu #stupac"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "tvrdo prelomi na stupcu <broj>, poravna"
 
 # definiranje programa za provjeru pravopisa
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "rabi prog za provjeru pravopisa"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
-msgstr "automatski spremi na izlazu, bez pitanja"
+msgstr "„Izlaz“ bez pitanja sprema datoteku"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
-msgstr "spremanje je (zadano) u Unix formatu"
+msgstr "datoteke sprema u Unix formatu [zadano]"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
-msgstr "čitanje (moguće je samo čitati/tražiti)"
+msgstr "„Čitanje“ (samo čitanje i traženje)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "dugačke redove ne prelama tvrdo"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "ne prelama tvrdo dugačke redove [zadano]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "bez prikaza pomoći u zadnja dva retka"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
-msgstr "Ctrl+Right skoči na kraj riječi"
+msgstr "Ctrl+Right se zaustavlja na kraju riječi"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
-msgstr "omogući obustavu (pauziranje)"
+msgstr "omogućuje obustavu (pauziranje)"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
-msgstr "omogući meko prelamanje redaka"
+msgstr "meko prelama preduge retke"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, inačica %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014..%s suradnici koji su doprinijeli programu nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " e-pošta: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1991,343 +2012,362 @@ msgstr ""
 "\n"
 " Ugrađene opcije:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
-msgstr "Nema naziva datoteke"
+msgstr "Nema imena datoteke"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
-"Spremiti promijenjeni međuspremnik?  (Odgovor „Ne“ će PONIŠTITI promjene) "
+"Spremiti promijenjeni međuspremnik?  (Odgovorom „Ne“ ODBACUJETE promjene) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Čitanje iz standardno ulaza; pritisnite ^D ili ^D^D da završite.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Nije uspjelo otvoriti standardni ulaz, stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Nije moguće ponovno otvoriti standardni ulaz pomoću tipkovnice\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Primljen SIGHUP ili SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
-msgstr "Žao nam je! Nano se srušio! Kȏd: %d. Molimo da prijavite ovaj bug.\n"
+msgstr "Nažalost, nano se srušio! Kȏd: %d. Molimo da prijavite taj bug.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Rabite „fg“ za povratak u nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Obustava nije omogućena"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
-msgstr "→ » Da «"
+msgstr "-> » Da «"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
-msgstr "→ » Ne «"
+msgstr "-> » Ne «"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tipka nije definirana u ovom kontekstu"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
-msgstr "M-[: sekvenciju „M-[“ nije moguće definirati"
+msgstr "Kombinacija M-[ nije moguća"
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
-msgstr "M-%c: nije definirano u ovom kontekstu"
+msgstr "M-%c: nije definiran u ovom kontekstu"
+
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Kombinacija ^[ nije moguća"
 
-#: src/nano.c:1572
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "^%c: nije definirano u ovom kontekstu"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "%c: nije definirano u ovom kontekstu"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Stupac „%s“ nije moguće istaknuti"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Opcija %s se ignorira; to je zadano\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Zatražena širina tabulatora „%s“ nije valjana"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Zatražena veličina ispune „%s“ nije valjana"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr "Utipkajte „%s -h“ za popis svih dostupnih opcija.\n"
+msgstr "Naredba „%s -h“ će vam pokazati sve dostupne opcije.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Loš navodnički regex „%s“: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Nevaljani broj retka ili stupca"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Pogreška u „%s“"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
-msgstr "Dobro došli u nano.  Pritisnite Ctrl+G za osnovne upute za uporabu."
+msgstr "Dobro došli u nano. Pritisnite Ctrl+G za osnovne upute za uporabu."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Dd"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ne"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Sve"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Greška u %s u retku %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ nije završen s \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Regularni izraz mora početi i završiti s \\\" znakom"
+msgstr "Regex mora početi i završiti s \\\" znakom"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Loši regularni izraz „%s“: %s"
+msgstr "Loš regex „%s“: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Nedostaje ime sintakse"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
-msgstr "Nespareni navodnici u imenu sintakse"
+msgstr "Nespareni navodnik u imenu sintakse"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaksa „none“ je rezervirana"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaksa „default“ ne prihvaća proširivanje"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
-msgstr "Nedostaje ime tipke"
+msgstr "Nema imena tipke"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Ime tipke je prekratko"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Ime tipke (prečaca) mora započeti s „^“, „M“, ili „F“"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Ime tipke %s nije valjano"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Morate navesti funkciju koja se veže na tipku"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Morate navesti meni (ili „all“) u kojem je tipka/prečac vezana/razvezana"
+"Morate navesti meni (ili „all“) u kojem je tipka/prečac povezana/razvezana"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Nije moguće pridružiti ime „%s“ funkciji"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nije moguće pridružiti ime „%s“ meniju"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkcija „%s“ ne postoji u meniju „%s“"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Sekvencija „%s“ ne smije se iznova redefinirati"
+msgid "Keystroke %s may not be rebound"
+msgstr "Kombinacija „%s“ ne smije se ponovno definirati"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Greška u proširivanju %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Boja „%s“ nije prepoznata"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Boja pozadine ne može biti (bright) sjajna"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Naredba „%s“ zahtijeva prethodnu „syntax“ naredbu"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Nedostaje ime boje"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
-msgstr "Nedostaje regularni izraz iza naredbe „%s“"
+msgstr "Nema regexa iza naredbe „%s“"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
-msgstr "Regularni izraz je prazan"
+msgstr "Prazni string/regex"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ zahtijeva odgovarajući „end=“"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
-msgstr "Sintaksa „default“ ne prihvaća „%s“ regularne izraze"
+msgstr "Sintaksa „default“ ne prihvaća „%s“ regexe"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
-msgstr "Nedostaje argument iza „%s“"
+msgstr "Nema argumenta iza „%s“"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument od „%s“ nema završni navodnik \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
-"Nijedna tipka ili prečac nije vezana na funkciju „%s“ u meniju „%s“. Kraj.\n"
+"Nijedna tipka/prečac nije vezana na funkciju „%s“ u meniju „%s“. Stop/kraj.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Po potrebi, pokrenite nano s opcijom -I da uredite svoje nanorc postavke.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "Sintaksa „%s“ (da ju se proširi) nije bila pronađena"
+msgstr "Nije moguće naći sintaksu „%s“ za proširenje"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaksa „%s“ nema „color“ naredbu"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Naredba „%s“ nije dopuštena u include datoteci; v. nanorc"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Naredba „%s“ nije shvaćena"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
-msgstr "Nedostaje opcija"
+msgstr "Nema opcije"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nepoznata opcija „%s“"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "Opciju „%s“ nije moguće ukinuti"
+msgstr "Opciju „%s“ nije moguće deaktivirati"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcija „%s“ zahtijeva argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
-msgstr "Argument nije ispravni višebajtni string"
+msgstr "Argument nije valjani višebajtni string"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Bjelina (kao znak) nije dopuštena"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Zahtijevaju se dva jednostupčana znaka"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
-msgstr "Ne možete pronaći svoj vlastiti direktorij!  Joj!"
+msgstr "Nije moguće naći vlastiti (osobni) direktorij!  Joj!"
 
 #. TRANSLATORS: The next four modify the search prompt.
 #: src/search.c:105
 msgid " [Case Sensitive]"
-msgstr " [VELIKA/mala]"
+msgstr " [pazite! m/V slova]"
 
 # da zamijenimo ‘regularni izraz’ s ‘regiz po ugledu na regexp?
 #: src/search.c:106
 msgid " [Regexp]"
-msgstr " [Reg.izraz]"
+msgstr " [regex]"
 
 #: src/search.c:109
 msgid " (to replace) in selection"
@@ -2342,7 +2382,7 @@ msgstr " (i zamijeni)"
 #. * more than half a second.
 #: src/search.c:225
 msgid "Searching..."
-msgstr "Traži se..."
+msgstr "Tražimo..."
 
 #: src/search.c:394
 #, c-format
@@ -2357,20 +2397,20 @@ msgstr "Nalaz uzorka zamijeniti?"
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:709
 msgid "Replace with"
-msgstr "Zamijeniti s(a)"
+msgstr "Zamijeni s(a)"
 
 #: src/search.c:740
 #, c-format
 msgid "Replaced %zd occurrence"
 msgid_plural "Replaced %zd occurrences"
-msgstr[0] "Zamijenjen %zd nalaz"
-msgstr[1] "Zamijenjeno %zd nalaza"
-msgstr[2] "Zamijenjeno %zd nalaza"
+msgstr[0] "Zamijenjen je %zd nalaz"
+msgstr[1] "Zamijenjena su %zd nalaza"
+msgstr[2] "Zamijenjeno je %zd nalaza"
 
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:768
 msgid "Enter line number, column number"
-msgstr "Unesite broj retka, broj stupca"
+msgstr "Unesite broj željenog retka (, stupca)"
 
 #: src/search.c:957
 msgid "Not a bracket"
@@ -2378,242 +2418,250 @@ msgstr "To nije zagrada"
 
 #: src/search.c:1018
 msgid "No matching bracket"
-msgstr "Zagrada nema odgovarajućega para"
+msgstr "Zagrada nema odgovarajućeg para"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Oznaka je stavljena"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
-msgstr "Oznaka je uklonjena"
+msgstr "Oznaka je ukinuta"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Greška pri pozivu „%s“"
+msgstr "Greška pri pokretanju „%s“"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Ova vrsta datoteke ne podržava komentiranje"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Nije moguće komentirati iza kraja datoteke"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
-msgstr "Međuspremnik za poništavanje je prazan!"
+msgstr "Nema više ništa za poništiti!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "dodavanje"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "Dodavanje"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
-msgstr "prelamanje"
+msgstr "Prelamanje retka"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "brisanje"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "Brisanje"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
-msgstr "spajanje"
+msgstr "Spajanje redaka"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "zamjenjivanje"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "Zamjena"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
-msgstr "brisanje"
+msgstr "Brisanje"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "izrezivanje"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "Izrezivanje"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "ljepljenje"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "Ljepljenje"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "umetanje"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "Umetanje"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
-msgstr "uvlačenje"
+msgstr "Uvlačenje"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "izvlačenje"
+msgstr "Izvlačenje"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
-msgstr "komentiranje"
+msgstr "Komentiranje"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
-msgstr "odKomentiranje"
+msgstr "Razkomentiranje"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "%s je poništeno"
+msgid "Undid %s"
+msgstr "Poništeno %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nema ništa za ponoviti!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "%s je ponovljeno"
+msgid "Redid %s"
+msgstr "Ponovljeno %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
-msgstr "Nije uspjelo stvoriti cijev"
+msgstr "Nije uspjelo napraviti cijev"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Nije uspjelo započeti novi proces"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
-msgstr "filtriranje"
+msgstr "Filtriranje"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Nije uspjelo otvoriti cijev: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Loši znakovi za citiranje (quotestr) %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "poravnanje"
 
-# suprotno od Poravnaj: Odravnaj
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Moguće je poništiti poravnanje!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Odabir poravnat"
+
+# poravnanje djeluje na ukupnu datoteku
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Sav tekst poravnat"
+
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Odlomak poravnat"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
-msgstr "Ovu riječ nije moguće naći: %s"
+msgstr "Nepronalažljiva riječ: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
-msgstr "Uredite zamjenu"
+msgstr "Predložite (uređenu) zamjenu"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Sljedeća riječ..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
-msgstr "Pravi se popis krivo napisanih riječi, pričekajte..."
+msgstr "Radi se popis krivo napisanih riječi, pričekajte..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
-msgstr "Nije bilo moguće odrediti veličinu međuspremnika za cijev"
+msgstr "Nije moguće odrediti veličinu međuspremnika za cijev"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
-msgstr "Greška pri pozivu „spell“"
+msgstr "Greška pri pokretanju „spell“"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
-msgstr "Greška pri pozivu „sort -f“"
+msgstr "Greška pri pokretanju „sort -f“"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
-msgstr "Greška pri pozivu „uniq“"
+msgstr "Greška pri pokretanju „uniq“"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Provjera pravopisa nije uspjela: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Provjera pravopisa nije uspjela: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Provjera pravopisa je završena"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
-msgstr "Za ovu vrstu datoteke nije definirani linter!"
+msgstr "Za tu vrstu datoteke linter nije definiran!"
 
 # lintera lintaje
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
-msgstr "Promijenjeni međuspremnik spremiti prije lintanja?"
+msgstr "Promijenjeni međuspremnik spremiti prije primjene lintera?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
-msgstr "Poziva se linter, pričekajte"
+msgstr "Pokrećemo linter; pričekajte..."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Nijedan obradivi redak nije dobiven od naredbe: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ova poruka je za neotvorenu datoteku %s; učitati ju u novi međuspremnik?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Nema poruka za ovu datoteku"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "To je prva poruka"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "To je zadnja poruka"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
-msgstr "%sRiječi: %zu  Redova: %zd  Znakova: %zu"
+msgstr "%s%zu riječi,  %zd redaka,  %zu znakova"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "U odabranom tekstu:  "
 
 # verbatim doslovce bukvalno
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Doslovni unos"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Nema fragmenta riječi"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
-msgstr "Nema više podudaranja"
+msgstr "Nema daljnjih podudaranja"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
-msgstr "Nema podudaranja"
+msgstr "Više nema podudaranja"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano nema dovoljno memorije!\n"
 
@@ -2639,79 +2687,126 @@ msgstr "Previše grešaka na standardnom ulazu\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Nepoznata sekvencija"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
-msgstr "Unos unikodnoga (6 heksadecimalnih brojeva) znaka: %s"
+msgstr "Unos Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Lintanje --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Direktorij:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Promijenjeno"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Čitanje"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Ograničeni način"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
-msgstr "Preostala upozorenja su prigušena"
+msgstr "Daljnja upozorenja nisu pokazana"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
-msgstr "redak %zd/%zd (%d%%), stupac %zu/%zu (%d%%), znakova %zu/%zu (%d%%)"
+msgstr "redak %zd/%zd (%d%%), stupac %zu/%zu (%d%%), znak %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Uređivač teksta nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "inačica"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
-msgstr "Poklon za vas od:"
+msgstr "Daju vam na upotrebu:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Posebna zahvala:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
-msgstr "mnogim prevoditeljima i TP-u"
+msgstr "svim prevoditeljima i TP-u"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "i svima ostalima koje smo zaboravili..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Hvala vam što koristite nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Zalijepi"
+
+#~ msgid "Unjustify"
+#~ msgstr "OdRavna"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "zalijepi sadržaj izreži-spremnika u aktualni redak"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Glatko klizanje?"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "ne doda znak novog retka kraju datoteke"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "prvi redak koristi za uređivanje"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "tvrdo prelomi na stupcu #stupac"
+
+#~ msgid "text add"
+#~ msgstr "Dodatak"
+
+#~ msgid "text delete"
+#~ msgstr "Uklanjanje"
+
+#~ msgid "text replace"
+#~ msgstr "Zamjena"
+
+#~ msgid "text cut"
+#~ msgstr "Izrezivanje"
+
+#~ msgid "text uncut"
+#~ msgstr "Ljepljenje"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Loši znakovi za citiranje (quotestr) %s: %s"
+
+# suprotno od Poravnaj: Odravnaj
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Moguće je OdPoravnati (poništiti poravnanje)!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Nevaljana tipka u načinu bez višestrukih međuspremnika"
 
diff --git a/po/hu.po b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.9.4-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-03-20 22:25+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -33,9 +33,9 @@ msgstr "Nem lehet a következő könyvtárat megnyitni: %s"
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Megszakítva"
 
@@ -50,9 +50,9 @@ msgstr "Nem léphet ki a következőből: %s"
 msgid "Can't move up a directory"
 msgstr "Nem lehet egy könyvtárral feljebb lépni"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
@@ -98,17 +98,17 @@ msgstr "Ez az egyetlen előfordulás"
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Ismeretlen szintaxisnév: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "a magic_load() meghiúsult: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "a magic_file(%s) meghiúsult: %s"
@@ -205,7 +205,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Új puffer"
 
@@ -309,804 +309,808 @@ msgstr "Beszúrandó fájl [ebből: %s]"
 msgid "File to insert [from %s]"
 msgstr "Beszúrandó fájl [ebből: %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Érvénytelen munkakönyvtár\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "A biztonsági mentés fájl írása sikertelen, folytatja a mentést? (N, ha "
 "bizonytalan) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Érvénytelen biztonsági mentés könyvtár\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nem lehet a következőn kívülre írni: %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Túl sok biztonsági mentés van?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s” írása közben: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu sor kiírva"
 msgstr[1] "%zu sor kiírva"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS formátum]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac formátum]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Biztonsági mentés]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "A kiválasztott rész beszúrása a szöveg elé"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "A kiválasztott rész hozzáfűzése a fájlhoz"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "A kiválasztott rész mentése fájlba"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Beszúrás ezen fájl elé"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Hozzáfűzés ehhez a fájlhoz"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Mentés ebbe a fájlba"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "A fájl létezik – nem írható felül"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Menti a fájlt MÁS NÉVEN? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "A(z) „%s” fájl már létezik, FELÜLÍRJA? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "A fájl megváltozott a lemezen"
 
-#: src/files.c:2291
+#: src/files.c:2285
 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:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(tovább)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Beillesztés"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Nem sork."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Aktuális puffer bezárása/Kilépés a nanoból"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Az aktuális puffer (vagy a kijelölt terület) lemezre mentése"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Másik fájl beszúrása a jelenlegi pufferbe (vagy újba)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése előrefelé"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése visszafelé"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Karakterlánc keresése"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Karakterlánc keresése"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "A fájllista frissítése"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Ugrás bal oldali oszlopra"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Ugrás jobb oldali oszlopra"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Ugrás az első sorra ebben az oszlopban"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Ugrás az utolsó sorra ebben az oszlopban"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Ugrás egy képernyővel fel"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Ugrás egy képernyővel le"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Aktuális sor (vagy kijelölt terület) kivágása és tárolása a kivágási "
 "pufferben"
 
-#: src/global.c:566
-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:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Tabulátor beszúrása a kurzor helyére"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "A kurzor helyének megjelenítése"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés cseréje"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Ugrás megadott pozícióra"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Szöveg kijelölése a kurzortól kezdve"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Aktuális sor (vagy kijelölt terület) másolása és tárolása a kivágási "
 "pufferben"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Az aktuális sor (vagy megjelölt sorok) behúzása"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Az aktuális sor (vagy megjelölt sorok) behúzása"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Az aktuális sor (vagy megjelölt sorok) behúzásának csökkentése"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Utolsó művelet visszavonása"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Az utoljára visszavont művelet ismétlése"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Egy karakterrel vissza"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Egy karakterrel előre"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Egy szóval vissza"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Egy szóval előre"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Az előző sorra"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "A következő sorra"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "A sor elejére"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "A sor végére"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Az előző szövegblokkra"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "A következő szövegblokkra"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "A fájl első sorára"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "A fájl utolsó sorára"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Az illeszkedő zárójelre"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Görgetés egy sorral fel a kurzor görgetése nélkül"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Görgetés egy sorral le a kurzor görgetése nélkül"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Váltás az előző fájlpufferre"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Váltás a következő fájlpufferre"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "A következő billentyűleütés szó szerinti beszúrása"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Új sor beszúrása a kurzor helyére"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévő karakter törlése"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor előtt álló karakter törlése"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Kivágás a kurzor helyétől a szó elejéig"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Kivágás a kurzor helyétől a következő szó elejéig"
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Aktuális bekezdés sorkizárttá rendezése"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Az egész fájl sorkizárttá rendezése"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "A szavak, sorok és karakterek megszámolása"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyő frissítése"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "A szerkesztő felfüggesztése (ha engedélyezett)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Aktuális szó kiegészítése"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 "Az aktuális sor (vagy megjelölt sorok) megjegyzéssé tétele/megjegyzés törlése"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Fájl mentése kérdés nélkül"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Következő keresése visszafelé"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Következő keresése előre"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Makró rögzítésének elindítása/leállítása"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Az utoljára rögzített makró futtatása"
 
-#: src/global.c:655
+#: src/global.c:649
 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:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "A keresés irányának megfordítása"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Reguláris kifejezések használatának átváltása"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Az előző kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "A következő kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS formátum használatának átváltása"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac formátum használatának átváltása"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Hozzáfűzés átváltása"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Elejére beszúrás átváltása"
 
-#: src/global.c:671
+#: src/global.c:665
 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:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Külső parancs végrehajtása"
 
-#: src/global.c:674
+#: src/global.c:668
 #, fuzzy
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Az aktuális puffer (vagy a kijelölt terület) lemezre mentése"
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr ""
 "Ne alakítsa át a fájlokat DOS/Mac\n"
 "\t\t\t\t\t  formátumról"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Új puffer használatának átváltása"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Puffer bezárása mentés nélkül"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Kilépés a fájlböngészőből"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Ugrás a lista első fájljára"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Ugrás a lista utolsó fájljára"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Ugrás a lista előző fájljára"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Ugrás a lista következő fájljára"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "A linter indítása, ha elérhető"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Az előző linter üzenetre"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "A következő linter üzenetre"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Súgó"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Kiírás"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Beolvasás"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Sorkizárás"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Keresés"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Csere"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Könyvtárba"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Kivágás"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Kivágás"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Helyes-e?"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ugrás sorra"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Vissza"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Újra"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Kis/Nagy"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regkif"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Vissza"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Nincs csere"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Sorkizár"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Zárójelre"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Mentés"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Ahol ez volt"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Előző"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Következő"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Előre"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Köv. szó"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Előző sor"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Köv. sor"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Előző blokk"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Köv. blokk"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Bek. kezdete"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Bek. vége"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Előző old."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Köv. old."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Első sor"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Utolsó sor"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Előző fájl"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Következő fájl"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Törlés"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Kivágás balra"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Kivágás jobbra"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Változatlan"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "behúzás"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "behúzás megszüntetése"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Sor megjegyzéssé"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Kiegészítés"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Rögzítés"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Makró futtatása"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Kijelöl"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Linterre"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Mentés"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ugrás szövegre"
@@ -1188,59 +1192,60 @@ msgstr "Köv. lint üz."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó megjelenítése"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Egyenletes görgetés"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Görgetés soronként fél képernyő helyett"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Hosszú sorok lágy tördelése"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Hosszú sorok kemény tördelése"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Sorszámozás"
 
@@ -1614,19 +1619,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Hiba „%s” írása közben: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "A billentyű illegális megjelenítés módban"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Ez a funkció ki van kapcsolva korlátozott módban"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "A súgó nem érhető el"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1635,7 +1640,7 @@ msgstr ""
 "\n"
 "A puffer a(z) %s fájlba írva\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1644,7 +1649,7 @@ msgstr ""
 "\n"
 "A puffer nem lett a(z) %s fájlba írva: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1653,7 +1658,7 @@ msgstr ""
 "\n"
 "A puffer nem került mentésre: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1664,7 +1669,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1673,7 +1678,7 @@ msgstr ""
 "A kurzornak egy fájl adott sorában való elhelyezéséhez tegye a sor számát\n"
 "egy „+” jellel a fájlnév elé. Az oszlopszám egy vessző után adható meg.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1682,310 +1687,321 @@ msgstr ""
 "Ha a fájlnév „-”, akkor a nano a szabványos bemenetről olvas adatokat.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tGNU hosszú kapcsoló\t\tJelentés\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Okos home billentyű engedélyezése"
 
-#: src/nano.c:780
+#: src/nano.c:776
 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:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <könyvtár>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<könyvtár>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 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:785
+#: src/nano.c:781
 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:787
+#: src/nano.c:783
 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:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Fájl új pufferbe olvasása alapesetben"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "(vim-stílusú) zárolási fájlok használata"
 
-#: src/nano.c:800
+#: src/nano.c:796
 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:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "nanorc fájlok keresésének kihagyása"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Ugrás az első sorra ebben az oszlopban"
+
 #: src/nano.c:806
 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:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Ne adjon új sorokat a fájlok végéhez"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Befejező szóközök levágása kemény tördeléskor"
 
-#: src/nano.c:815
+#: src/nano.c:817
 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:817
-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:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Kurzor helyének naplózása és olvasása"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <szöveg>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<szöveg>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Korlátozott mód"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Görgetés soronként fél képernyő helyett"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#oszlop>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#oszlop>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 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:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Törölje gyorsan az állapotsort"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Verziószám kiírása és kilépés"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Szóhatárok pontosabb észlelése"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <szöveg>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<szöveg>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Ezen további karakterek is szó részei"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <név>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<név>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 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:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Gyenge tördeléskor azt az üres karaktereknél tördeljen"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ne tördelje keményen a hosszú sorokat"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Kurzor pozíciójának állandó megjelenítése"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Visszatörlés/törlés zavarainak javítása"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Kurzor megjelenítése a fájlböngészőben"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Megjeleníti ezt a súgóüzenetet, és kilép"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Új sorok automatikus behúzása"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 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:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Sorszámok megjelenítése a szöveg előtt"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Egér használatának engedélyezése"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Ne olvassa a fájlt (csak írja)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <könyvtár>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<könyvtár>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Munkakönyvtár beállítása"
 
-#: src/nano.c:874
+#: src/nano.c:880
 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:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#oszlop>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#oszlop>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
 msgstr ""
-"Kemény töréspont beállítása a #oszlop\n"
-"\t\t\t\t\t  oszlopnál"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr ""
 "Alternatív helyesírás-ellenőrző\n"
 "\t\t\t\t\t  használata"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatikus mentés kilépéskor"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Fájl mentése alapesetben Unix formátumba"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Megjelenítés mód (csak olvasható)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ne tördelje keményen a hosszú sorokat"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "A két súgósor elrejtése"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Felfüggesztés engedélyezése"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano %s verzió\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s a nano közreműködői\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1994,272 +2010,292 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Nincs fájlnév"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Menti a módosított puffert? (A „Nem” válasz ELDOBJA a módosításokat.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Nem sikerült a szabványos bemenet megnyitása: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "A szabványos bemenet nem nyitható újra a billentyűzetről, elnézést\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg” kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "A felfüggesztés nem engedélyezett"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Kiosztatlan billentyű"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Kioszthatatlan billentyű: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Kiosztatlan billentyű: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Kioszthatatlan billentyű: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Kiosztatlan billentyű: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Kiosztatlan billentyű: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "%s kulcsnév érvénytelen"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s” tabméret érvénytelen"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s” kitöltésméret érvénytelen"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Az elérhető kapcsolók megjelenítéséhez adja ki a „%s -h” parancsot.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Hibás regex: „%s”: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Hibák ebben: „%s”"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "IiYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "MmAa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Igen"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nem"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Mindet"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Hiba a(z) %s %zu. sorában: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "A reguláris kifejezéseknek \" karakterekkel kezdődniük és végződniük"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s”: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Hiányzó szintaxisnév"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Pár nélküli idézőjel a szintaxisnévben"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A „nincs” szintaxis fenn van tartva"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Az „alapértelmezett” szintaxis nem fogad el kiterjesztéseket"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Hiányzó billentyűnév"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "A billentyűnév túl rövid"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "A billentyűnévnek a „^”, „M”, vagy „F” egyikével kell kezdődnie"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "%s kulcsnév érvénytelen"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Meg kell adnia egy funkciót, amelyhez billentyűt kíván társítani"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Meg kell adni egy menüt (vagy „all”-t) a billentyű társításához / a társítás "
 "megszüntetéséhez"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "A név („%s”) nem képezhető le funkcióra"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "A név („%s”) nem képezhető le menüre"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "„%s” funkció nem létezik ebben a menüben: „%s”"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "A billentyűleütés („%s”) nem társítható újra"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Hiba %s kibontásakor: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "A(z) „%s” szín nem értelmezhető"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Egy háttérszín nem lehet világos"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Egy „%s” parancsot „syntax” parancsnak kell megelőznie"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Hiányzó regex karakterlánc a(z) „%s” parancs után"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Üres regex karaktersorozat"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=” -hoz kell egy megfelelő „end=”"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Az „alapértelmezett” szintaxis nem fogad el „%s” regexeket"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Hiányzó argumentum a(z) „%s” után"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "A(z) „%s” argumentuma mögül hiányzik a \" jel"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2267,58 +2303,58 @@ msgstr ""
 "Használja a nanot a -I kapcsolóval, ha módosítani kívánja a nanorc "
 "beállításait.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "A kiterjesztendő szintaxis („%s”) nem található"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s” szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, 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:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s” parancs nem értelmezhető"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Hiányzó kapcsoló"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ismeretlen „%s” opció"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "A(z) „%s” beállítás nem törölhető"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s” kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Az argumentum nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
@@ -2380,237 +2416,250 @@ msgstr "Nem zárójel"
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Kijelölés kezdete"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Kijelölés vége"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s” meghívásakor"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "A megjegyzések nem támogatottak ehhez a fájltípushoz"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "A fájl vége mögé nem lehet megjegyzést tenni"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "A visszavonási puffer üres!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "szöveg hozzáadása"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "sortörés"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "szöveg törlése"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "A kiválasztásban:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "sorok egyesítése"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "szöveg cseréje"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "A helyettesítő érték módosítása"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "szöveg kivágása"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "kivágás visszavonása"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "szöveg beszúrása"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "behúzás"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "behúzás megszüntetése"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "megjegyzés"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "megjegyzés ki"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Művelet visszavonva (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nincs mit ismételni."
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Nem hozható létre a cső"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Nem sikerült a szabványos bemenet megnyitása: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Hibás idézetszöveg: %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Most már lehet nem sorkizárttá tenni!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Az egész fájl sorkizárttá rendezése"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Aktuális bekezdés sorkizárttá rendezése"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Megtalálhatatlan szó: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "A helyettesítő érték módosítása"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Köv. szó…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Hiba a „spell” meghívásakor"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Hiba a „sort -f” meghívásakor"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq” meghívásakor"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Nincs megadva linter ehhez a fájltípushoz!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Menti a módosított puffert a linter használata előtt?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "A linter indítása, kis türelmet"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "0 feldolgozható sor érkezett a parancstól: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ez az üzenet a meg nem nyitott %s fájlhoz tartozik, megnyitja új pufferben?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Első üzenetnél"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Utolsó üzenetnél"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sSzavak: %zu  Sorok: %zd  Karakterek: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Szó szerinti bevitel"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Nincs több találat"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Nincs találat"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano: elfogyott a memória!"
@@ -2638,76 +2687,81 @@ msgstr "Túl sok hiba a szabványos bemenetről"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Ismeretlen sorozat"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode bevitel: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Módosítva"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Nézet"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Korlátozott mód"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "A további figyelmeztetések el lesznek fojtva"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "sor %zd/%zd (%d%%), oszlop %zu/%zu (%d%%), karakter %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "számos fordító és a TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Köszönjük, hogy a nano-t választotta!"
 
@@ -2717,9 +2771,18 @@ msgstr "Köszönjük, hogy a nano-t választotta!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "A billentyű illegális nem többpufferes módban"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Beillesztés"
+
+#~ msgid "Unjustify"
+#~ msgstr "Nem sork."
+
 #~ msgid "WhereIs Next"
 #~ msgstr "Következőre"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "A kivágási pufferben lévő sor beillesztése az aktuális sorba"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "Az utolsó keresés megismétlése"
 
@@ -2744,6 +2807,9 @@ msgstr "Köszönjük, hogy a nano-t választotta!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Eggyel több sor használata a szerkesztéshez"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Egyenletes görgetés"
+
 #~ msgid "Backup files"
 #~ msgstr "Fájlok biztonsági mentése"
 
@@ -2753,9 +2819,22 @@ msgstr "Köszönjük, hogy a nano-t választotta!"
 #~ msgid "No conversion from DOS/Mac format"
 #~ msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Ne adjon új sorokat a fájlok végéhez"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr ""
+#~ "Eggyel több sor használata a\n"
+#~ "\t\t\t\t\t  szerkesztéshez"
+
 #~ msgid "Quoting string"
 #~ msgstr "Idézetszöveg"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr ""
+#~ "Kemény töréspont beállítása a #oszlop\n"
+#~ "\t\t\t\t\t  oszlopnál"
+
 #~ msgid "Reading from stdin, ^C to abort\n"
 #~ msgstr "Olvasás a szabványos bemenetről, ^C megszakítja\n"
 
@@ -2764,6 +2843,27 @@ msgstr "Köszönjük, hogy a nano-t választotta!"
 #~ "Végzetes hiba: nincsenek billentyűk leképezve a függvényhez („%s”). "
 #~ "Kilépés.\n"
 
+#~ msgid "text add"
+#~ msgstr "szöveg hozzáadása"
+
+#~ msgid "text delete"
+#~ msgstr "szöveg törlése"
+
+#~ msgid "text cut"
+#~ msgstr "szöveg kivágása"
+
+#~ msgid "text uncut"
+#~ msgstr "kivágás visszavonása"
+
+#~ msgid "text replace"
+#~ msgstr "szöveg cseréje"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Hibás idézetszöveg: %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Most már lehet nem sorkizárttá tenni!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "A helyesírás-ellenőrző indítása, kis türelmet"
 
diff --git a/po/id.po b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -29,9 +29,9 @@ msgstr "Tidak dapat memindahkan direktori"
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -46,9 +46,9 @@ msgstr "Tidak dapat menulis di luar %s"
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
@@ -94,17 +94,17 @@ msgstr "Hanya ini adanya"
 msgid "No current search pattern"
 msgstr ""
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nama sintaks tidak ada"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -196,7 +196,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Buffer baru"
 
@@ -297,853 +297,848 @@ msgstr "File yang akan disisipkan [dari %s] "
 msgid "File to insert [from %s]"
 msgstr "File yang akan disisipkan [dari %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Set direktori operasi"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Tidak dapat memindahkan direktori"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis di luar %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "No %s ditulis (terlalu banyak file backup?)\n"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Menulis %d baris"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Backup]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Menulis Pilihan ke File"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nama File untuk di-Tulis"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "File ada, DITIMPA ?"
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(lagi)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Tutup"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "UnCut Teks"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-msgstr "UnJustifikasi"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Pencarian backward"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr ""
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Kembalikan dari cutbuffer ke baris saat ini"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: src/global.c:567
+#: src/global.c:561
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:571
+#: src/global.c:565
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:572
+#: src/global.c:566
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:577
 #, fuzzy
 msgid "Go back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: src/global.c:584
+#: src/global.c:578
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: src/global.c:585
+#: src/global.c:579
 #, fuzzy
 msgid "Go back one word"
 msgstr "Ke belakang satu kata"
 
-#: src/global.c:586
+#: src/global.c:580
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Ke depan satu kata"
 
-#: src/global.c:587
+#: src/global.c:581
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:588
+#: src/global.c:582
 #, fuzzy
 msgid "Go to next line"
 msgstr "Turun satu baris"
 
-#: src/global.c:589
+#: src/global.c:583
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Pindah ke awal baris ini"
 
-#: src/global.c:590
+#: src/global.c:584
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:602
+#: src/global.c:596
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:605
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:609
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:616
+#: src/global.c:610
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:630
+#: src/global.c:624
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh (redraw) layar saat ini"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Pencarian backward"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr ""
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:657
+#: src/global.c:651
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:659
+#: src/global.c:653
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:662
+#: src/global.c:656
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:664
+#: src/global.c:658
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:667
+#: src/global.c:661
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Tulis file dalam format Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Eksekusi perintah eksternal"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Jangan konversi file dari format DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Pilih insert ke buffer baru"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:683
+#: src/global.c:677
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:684
+#: src/global.c:678
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:685
+#: src/global.c:679
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:686
+#: src/global.c:680
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:687
+#: src/global.c:681
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Ke Direktori"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Bantuan"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "Tulis"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Baca File"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ganti"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Ke Direktori"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Ptng Teks"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Mengeja"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ke baris"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:805
+#: src/global.c:797
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:813
+#: src/global.c:805
 #, fuzzy
 msgid "Backwards"
 msgstr " [Backwards]"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Tiada Replace"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 #, fuzzy
 msgid "FullJstify"
 msgstr "Justifikasi"
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Di mana"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "File Sebelumnya"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "Hlm berikutnya"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Depan"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Kata Berikut"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:882
+#: src/global.c:885
 #, fuzzy
 msgid "Prev Line"
 msgstr "Hlm sebelumnya"
 
-#: src/global.c:884
+#: src/global.c:887
 #, fuzzy
 msgid "Next Line"
 msgstr "File Sesudahnya"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Kata Sebelum"
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Kata Berikut"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Hlm sebelumnya"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Hlm berikutnya"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Baris pertama"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Baris terakhir"
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "File Sesudahnya"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Hapus"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Ptng Teks"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Tunda"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr ""
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Inden otomatis"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr ""
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "Ke baris"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 #, fuzzy
 msgid "Go To Text"
@@ -1227,63 +1222,63 @@ msgstr ""
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1400
+#: src/global.c:1410
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Scrolling halus"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr ""
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1416
+#: src/global.c:1426
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1422
+#: src/global.c:1432
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/global.c:1424
+#: src/global.c:1434
 #, fuzzy
 msgid "Line numbering"
 msgstr "Masukkan nomor baris"
@@ -1640,21 +1635,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr ""
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Tidak dapat mengunjungi parent dalam mode terbatas"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1663,7 +1658,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1672,7 +1667,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1681,7 +1676,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1690,316 +1685,329 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsi\t\tOpsi Panjang\t\tArti\n"
 
 #. 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:778
+#: src/nano.c:774
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:780
+#: src/nano.c:776
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Backup file yang ada ketika menyimpan"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Log dan baca sejarah pencarian/penggantian string"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat file nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
 msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan konversi file dari format DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr ""
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Posisi kursor konstan"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=[str]"
 
-#: src/nano.c:825
+#: src/nano.c:826
 #, fuzzy
 msgid "Regular expression to match quoting"
 msgstr "Lakukan pencarian ekspresi reguler"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr ""
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:832
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:832
+#: src/nano.c:830
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[num]"
 
-#: src/nano.c:833
+#: src/nano.c:831
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Set lebar tab ke num"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi dan keluar"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:843
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Definisi sintaks untuk digunakan"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Inden baris baru secara otomatis"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Menampilkan posisi kursor secara konstan"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Inden baris baru secara otomatis"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr "Biarkan ^K memotong dari kursor hingga akhir baris"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dir]"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Set direktori operasi"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserve kunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:876
+#: src/nano.c:882
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:881
+#: src/nano.c:887
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Aktifkan speller alternatif"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto save saat keluar, jangan tanya"
 
-#: src/nano.c:886
+#: src/nano.c:892
 #, fuzzy
 msgid "Save a file by default in Unix format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/nano.c:888
+#: src/nano.c:894
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Mode view (hanya baca)"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Jangan wrap baris panjang"
 
-#: src/nano.c:892
+#: src/nano.c:898
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Jangan tampilkan jendela bantuan"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Aktifkan suspend"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2008,331 +2016,350 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, fuzzy, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Tidak dapat membuka kembali %s: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr ""
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Regex jelek \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Tidak"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Semua"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "String regexp harus dimulai dan diakhiri dengan sebuah karakter \"\n"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 #, fuzzy
 msgid "Missing key name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr ""
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
@@ -2396,247 +2423,255 @@ msgstr "Bukan tanda kurung"
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Set Tanda"
 
-#: src/text.c:67
+#: src/text.c:61
 #, fuzzy
 msgid "Mark Unset"
 msgstr "Unset Tanda"
 
-#: src/text.c:77
+#: src/text.c:71
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr ""
 
-#: src/text.c:759 src/text.c:939
-#, fuzzy
-msgid "text delete"
-msgstr "File Sesudahnya"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr ""
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr ""
 
-#: src/text.c:788 src/text.c:967
+#: src/text.c:596 src/text.c:776
 #, fuzzy
-msgid "text replace"
-msgstr " (ganti)"
+msgid "replacement"
+msgstr "Edit pengganti"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr ""
 
-#: src/text.c:819 src/text.c:999
+#: src/text.c:628 src/text.c:808
 #, fuzzy
-msgid "text insert"
-msgstr "File Sesudahnya"
+msgid "insertion"
+msgstr "Arah"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Inden otomatis"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Inden otomatis"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr ""
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr ""
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Tidak dapat membuka kembali %s: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Quote string buruk %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Sekarang dapat melakukan UnJustify"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Justifikasi paragraf saat ini"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "Kata Berikut"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Gagal memanggil \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 #, fuzzy
 msgid "At first message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3329
+#: src/text.c:3093
 #, fuzzy
 msgid "At last message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr ""
 
-#: src/text.c:3416
+#: src/text.c:3180
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano kehabisan memori!"
@@ -2663,80 +2698,84 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr ""
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 #, fuzzy
 msgid "Modified"
 msgstr " Dimodifikasi "
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 #, fuzzy
 msgid "View"
 msgstr " View "
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr ""
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), kol %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
@@ -2825,6 +2864,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Backing up file"
 #~ msgstr "Membackup file"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Scrolling halus"
+
 #~ msgid "Auto wrap"
 #~ msgstr "Wrap otomatis"
 
@@ -2879,6 +2921,12 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Open next loaded file"
 #~ msgstr "Buka file yang akan dimuat"
 
+#~ msgid "UnJustify"
+#~ msgstr "UnJustifikasi"
+
+#~ msgid "UnCut Txt"
+#~ msgstr "UnCut Teks"
+
 #~ msgid "Up"
 #~ msgstr "Naik"
 
@@ -2888,9 +2936,6 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Find Other Bracket"
 #~ msgstr "Cari Kurung Lain"
 
-#~ msgid "Direction"
-#~ msgstr "Arah"
-
 #~ msgid "History"
 #~ msgstr "Sejarah"
 
@@ -2977,6 +3022,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Spell checking gagal: tidak dapat menulis file temp!"
 
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Sekarang dapat melakukan UnJustify"
+
 #~ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 #~ msgstr ""
 #~ "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
diff --git a/po/it.po b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.2-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-11-07 14:37+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -28,9 +28,9 @@ msgstr "Impossibile aprire la directory: %s"
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Annullato"
 
@@ -45,9 +45,9 @@ msgstr "Impossibile uscire da %s"
 msgid "Can't move up a directory"
 msgstr "Impossibile risalire la directory"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
@@ -93,17 +93,17 @@ msgstr "Questa è l'unica occorrenza"
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nome di sintassi sconosciuto: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() non riuscito: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) non riuscito: %s"
@@ -200,7 +200,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu riga (%s)"
 msgstr[1] "%s -- %zu righe (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nuovo buffer"
 
@@ -304,800 +304,804 @@ msgstr "File da inserire senza conversione [da %s]"
 msgid "File to insert [from %s]"
 msgstr "File da inserire [da %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Imposta la directory operativa\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Directory di backup non valida\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossibile salvare fuori da %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errore durante la scrittura del file di backup %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Troppi file di backup?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Scritta %zu riga"
 msgstr[1] "Scritte %zu righe"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Backup]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Inserisce selezione in testa al file"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Accoda selezione al file"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Salva selezione nel file"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nome del file in cui inserire in testa"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nome del file a cui accodare"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nome del file in cui salvare"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Troppo piccolo"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Il file esiste, impossibile sovrascrivere"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Salvare il file con un NOME DIFFERENTE? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Il file \"%s\" esiste. SOVRASCRIVERE? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Il file sul disco è cambiato"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Il file è stato modificato dall'apertura. Continuare a salvare? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(ancora)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Esci"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Incolla"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Degiustif."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Salva su disco il file corrente (o la regione selezionata)"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Inserisce un altro file nel corrente (o in un nuovo buffer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Cerca in avanti una stringa o un'espressione regolare"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Cerca all'indietro una stringa o un'espressione regolare"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Cerca una stringa in avanti"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Cerca una stringa all'indietro"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Aggiorna la lista di file"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Va alla colonna di sinistra"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Va alla colonna di destra"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Va alla prima riga di questa colonna"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Va all'ultima riga di questa colonna"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Va alla schermata precedente"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Va alla schermata successiva"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Taglia la riga corrente (o la regione selezionata) e la memorizza nel "
 "cutbuffer"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Incolla dal cutbuffer nella riga corrente"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Inserisce una tabulazione alla posizione del cursore"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Esegue il correttore ortografico, se disponibile"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Sostituisce una stringa o un'espressione regolare"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Va a un numero di riga e di colonna specifico"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marca testo partendo dalla posizione del cursore"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Copia la riga corrente (o la regione selezionata) e la memorizza nel "
 "cutbuffer"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Scarta la riga corrente (o le righe selezionate)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Indenta la riga corrente (o le righe selezionate)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Deindenta la riga corrente (o le righe selezionate)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Ripete l'ultima operazione"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Arretra di un carattere"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avanza di un carattere"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Arretra di una parola"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avanza di una parola"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Va alla riga precedente"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Va alla riga successiva"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Va all'inizio della riga corrente"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Va alla fine della riga corrente"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Va al blocco di testo precedente"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Va al blocco di testo successivo"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Va all'inizio del paragrafo; poi al paragrafo precedente"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Va alla fine del paragrafo; poi al paragrafo successivo"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Va alla prima riga del file"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Va all'ultima riga del file"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Va alla parentesi corrispondente"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Scorre in alto di una riga senza spostare il cursore"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Scorre in basso di una riga senza spostare il cursore"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Va al buffer precedente"
 
-#: src/global.c:612
+#: src/global.c:606
 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:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserisce un carattere letteralmente"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Inserisce una tabulazione alla posizione del cursore"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Inserisce un ritorno a capo alla posizione del cursore"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Elimina il carattere sotto il cursore"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina il carattere a sinistra del cursore"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Taglia all'indietro dal cursore a inizio parola"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Taglia in avanti dal cursore all'inizio della prossima parola"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Taglia dal cursore alla fine del file"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Giustifica l'intero file"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta il numero di parole, righe e caratteri"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Sospende l'editor (se la sospensione è abilitata)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Prova a completare la parola corrente"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Commenta/decommenta la riga corrente (o le righe selezionate)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Salva il file senza chiedere conferma"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Ricerca la prossima occorrenza all'indietro"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Ricerca la prossima occorrenza in avanti"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Inizia/termina la registrazione di una macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Esegui l'ultima macro registrata"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Considera maiuscole/minuscole nella ricerca"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inverte la direzione di ricerca"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Attiva/disattiva uso di espressioni regolari"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione precedente"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione successiva"
 
 # FIXME
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Usa il formato DOS"
 
 # FIXME
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Usa il formato Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Attiva/disattiva scrittura in coda al file"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Attiva/disattiva scrittura in testa al file"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Attiva/disattiva creazione copia di backup del file originale"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Esegue un comando esterno"
 
 # FIXME
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Fa una pipe del file corrente (o della regione selezionata) al comando"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Non converte dai formati DOS/Mac"
 
 # FIXME
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Usa un nuovo buffer"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Chiude il buffer senza salvarlo"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Va al browser di file"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Esce dal browser di file"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Va al primo file dell'elenco"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Va all'ultimo file dell'elenco"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Va al precedente file dell'elenco"
 
-#: src/global.c:687
+#: src/global.c:681
 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:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Va alla directory"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Esegue il linter, se disponibile"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Va alla messaggio precedente del linter"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Va al messaggio successivo del linter"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Guida"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Salva"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Inserisci"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Giustifica"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Vai a dir."
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Taglia"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Fa una pipe del testo"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Vai a riga"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copia"
 
 # FIXME
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Maius/Minus"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Espr.Reg."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Indietro"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Non sost."
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Più vecchio"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Più nuovo"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Giust.File"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Parentesi"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Salva"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Cerca Ind."
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Successiva"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Avanti"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Parola succ."
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Riga prec."
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Riga succ."
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Blocco prec."
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Blocco succ."
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Iniz.Par."
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fine Par."
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pag Prec."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Pag Succ."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Prima riga"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Ultima riga"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "File prec."
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "File succ."
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Elimina"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Taglia sin."
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Taglia des."
 
 # FIXME
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Letterale"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Indenta"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Deindenta"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Commenta righe"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completa"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Registra"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Esegui macro"
 
 # FIXME
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Scarta testo"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Salva"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Vai al testo"
@@ -1177,59 +1181,60 @@ msgstr "Msg lint succ."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Scorrimento continuo"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Scorrimento a ogni riga invece che a ogni metà schermata"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "A capo automatico morbido delle righe lunghe"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "A capo automatico delle righe lunghe"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Sospensione"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numerazione righe"
 
@@ -1602,19 +1607,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Errore durante la scrittura di %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "La chiave non è valida in modalità Visualizza"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Questa funzione è disattivata in modalità ristretta"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Aiuto non disponibile"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1623,7 +1628,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1632,7 +1637,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1641,7 +1646,7 @@ msgstr ""
 "\n"
 "Buffer scritto: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1652,7 +1657,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1662,7 +1667,7 @@ msgstr ""
 "numero di riga con un \"+\" prima del nome del file. Il numero di colonna\n"
 "può essere aggiunto dopo una virgola.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1671,292 +1676,304 @@ msgstr ""
 "Quando il nome del file è \"-\", nano legge i dati dallo standard input.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opzione\t\tOpzione lunga\t\tSignificato\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Abilita il tasto Inizio intelligente"
 
 # Questo messaggio è stato tradotto come uno simile più in alto.
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Crea una copia di backup dei file esistenti"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Directory in cui salvare i file di backup"
 
 # FIXME
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Usa grassetto invece di testo inverso"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Converte le tabulazioni in spazi"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Legge un file in un nuovo buffer in modo predefinito"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Usa file di lock come vim"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Salva e leggi le stringhe di ricerca/sostituzione"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Non considera i file nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Va alla prima riga di questa colonna"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Risolve il problema di confusione del tastierino numerico"
 
-# FIXME
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Non aggiunge caratteri newline in fondo ai file"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
 # FIXME
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Rimuovi spazi finali quando le righe vengono interrotte"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converte i file dai formati DOS/Mac"
 
-# FIXME
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Usa una riga in più per le modifiche"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Salva e legge la posizione del cursore"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <espr.reg.>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<espr.reg.>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Espressione regolare per la stringa di quoting"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Modalità ristretta"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Scorrimento a ogni riga invece che a ogni metà schermata"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Imposta la lunghezza della tabulazione a #cols"
 
 # FIXME
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Svuota la barra di stato velocemente"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Stampa informazioni sulla versione ed esce"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Rileva più precisamente i limiti delle parole"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Altri caratteri da considerare parti di parole"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nome>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nome>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definizione di sintassi da usare per la colorazione"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Scarta una regione selezionata con BackSpace e Canc"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Fai l'a capo automatico morbido ai caratteri di spazio"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Non interrompe le righe lunghe"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Mostra sempre la posizione del cursore"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Risolve il problema Backspace/Canc"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Mostra il cursore nel browser di file e nella pagina di aiuto"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Mostra questo messaggio di aiuto ed esce"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indenta automaticamente le nuove righe"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Taglia dal cursore a fine riga"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Mostra i numeri di riga prima del testo"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Abilita l'uso del mouse"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Non legge il file (solo scrittura)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Imposta la directory operativa"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Rispetta XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-# FIXME
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Imposta l'interruzione delle righe a #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Attiva correttore ortografico alternativo"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvataggio automatico in uscita senza conferma"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Salvataggio predefinito in formato Unix"
 
 # "Visualizza" è il nome della modalità. Appare in alto a destra.
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Visualizza (sola lettura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Non interrompe le righe lunghe"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Non mostra la barra dei comandi"
 
 # FIXME
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Modifica Ctrl+Right di modo che si sposti a fine parola"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Abilita sospensione"
 
 # FIXME
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Abilita a capo automatico morbido delle righe"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano versione %s\n"
 
 # FIXME
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s i partecipanti a nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1965,274 +1982,294 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Nessun nome di file"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Salvare il buffer modificato? (Rispondere \"No\" per annullare le modifiche)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Leggendo dallo standard input; usare ^D o ^D^D per terminare.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Apertura dello standard input non riuscita: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Spiacenti, nano ha avuto un crash! Codice: %d. Contattare gli sviluppatori.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Sospensione non abilitata"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Chiave non collegata"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Chiave non collegabile: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Chiave non collegata: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Chiave non collegabile: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Chiave non collegata: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Chiave non collegata: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Nome della chiave \"%s\" non valido"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Usare \"%s -h\" per elencare le opzioni disponibili.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Espressione regolare non corretta \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Errori in \"%s\""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Benvenuti a nano. Per la pagina d'aiuto, usare Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sì"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "No"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Tutti"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Errore in %s alla riga %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Nome di sintassi mancante"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Virgolette non chiuse nel nome di sintassi"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintassi \"none\" è riservata"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "La sintassi \"default\" non accetta estensioni"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Nome di chiave mancante"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Il nome di chiave è troppo corto"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "I nomi di chiavi devono cominciare con \"^\", \"M\", o \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Nome della chiave \"%s\" non valido"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Occorre specificare una funzione a cui associare la chiave"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossibile associare il nome \"%s\" a una funzione"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossibile associare il nome \"%s\" a un menù"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La funzione \"%s\" non esiste nel menù \"%s\""
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "La chiave \"%s\" non può essere reimpostata"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errore durante l'espansione di %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Colore \"%s\" non riconosciuto"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Il colore di sfondo non può essere \"bright\""
 
 # FIXME
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Il comando \"%s\" richiede un previo comando di sintassi"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Espressione regolare mancante dopo il comando \"%s\""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Espressione regolare vuota"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "La sintassi \"default\" non accetta espressioni regolari \"%s\""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Argomento mancante dopo \"%s\""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "L'argomento di \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Nessuna chiave associata alla funzione \"%s\" nel menu \"%s\". Uscita.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2240,59 +2277,59 @@ msgstr ""
 "Usare nano con l'opzione -I se occorre modificare le impostazioni di "
 "nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintassi \"%s\" non ha direttive di colore"
 
 # FIXME
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Opzione mancante"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opzione \"%s\" sconosciuta"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Impossibile rimuovere l'opzione \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "L'argomento non è una stringa multibyte valida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
@@ -2355,238 +2392,250 @@ msgstr "Non è una parentesi"
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marcatura impostata"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marcatura disattivata"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Commenti non supportati per questo tipo di file"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Impossibile commentare dopo la fine del file"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Buffer di annullamento vuoto."
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "aggiunta testo"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "interruzione riga"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "rimozione testo"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Nella selezione:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "unione riga"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "sostituzione testo"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Modifica sostituzione"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "cancellazione"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "taglio testo"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-# FIXME
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "incolla testo"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "inserimento testo"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "indenta"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "deindenta"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "commento"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "decommenta"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Azione annullata (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Niente da ripetere."
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Impossibile creare la pipe"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtra"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Apertura della pipe non riuscita: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Stringa di quoting non corretta %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "È ora possibile togliere la giustificazione."
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Giustifica l'intero file"
 
-#: src/text.c:2606
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Giustifica il paragrafo corrente"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Parola non cercabile: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Parola successiva..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Errore nel chiamare \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Errore nel chiamare \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Nessun linter definito per questo tipo di file!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Salvare il buffer prima dell'esecuzione del linter?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Esecuzione del linter, attendere"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Ricevute 0 righe dal comando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Nessun messaggio per questo file"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Primo messaggio"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ultimo messaggio"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sParole: %zu  Righe: %zd  Caratteri: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Input letterale"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Nessun frammento di parola"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Nessun'altra corrispondenza"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Nessuna corrispondenza"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano ha esaurito la memoria.\n"
 
@@ -2612,75 +2661,126 @@ msgstr "Troppi errori dallo standard input\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Sequenza sconosciuta"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Input Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Linter in corso --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Visualizza"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Modalità ristretta"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Ulteriori avvisi sono stati soppressi"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "Riga %zd/%zd (%d%%), colonna %zu/%zu (%d%%), carattere %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Creato per voi da:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "i numeriso traduttori e il Translation Project"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
+
+#~ msgid "Uncut Text"
+#~ msgstr "Incolla"
+
+#~ msgid "Unjustify"
+#~ msgstr "Degiustif."
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Incolla dal cutbuffer nella riga corrente"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Scorrimento continuo"
+
+# FIXME
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Non aggiunge caratteri newline in fondo ai file"
+
+# FIXME
+#~ msgid "Use one more line for editing"
+#~ msgstr "Usa una riga in più per le modifiche"
+
+# FIXME
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Imposta l'interruzione delle righe a #cols"
+
+#~ msgid "text add"
+#~ msgstr "aggiunta testo"
+
+#~ msgid "text delete"
+#~ msgstr "rimozione testo"
+
+#~ msgid "text replace"
+#~ msgstr "sostituzione testo"
+
+#~ msgid "text cut"
+#~ msgstr "taglio testo"
+
+# FIXME
+#~ msgid "text uncut"
+#~ msgstr "incolla testo"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Stringa di quoting non corretta %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "È ora possibile togliere la giustificazione."
diff --git a/po/ja.po b/po/ja.po
@@ -6,10 +6,10 @@
 # Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>, 2016, 2017, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.0-pre1\n"
+"Project-Id-Version: nano 3.2-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-08-30 09:11+0900\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2018-11-18 21:34+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -32,9 +32,9 @@ msgstr "ディレクトリを開けません: %s"
 msgid "Go To Directory"
 msgstr "ディレクトリへ移動"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "取り消しました"
 
@@ -49,9 +49,9 @@ msgstr "%s の外部へ移動できません"
 msgid "Can't move up a directory"
 msgstr "上位のディレクトリへ移動できません"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "%s: %s の読み込みに失敗しました"
@@ -97,17 +97,17 @@ msgstr "他に見つかりません"
 msgid "No current search pattern"
 msgstr "検索語が指定されていません"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "構文名がありません: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() が失敗しました: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) が失敗しました: %s"
@@ -205,7 +205,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu 行 (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "新しいバッファ"
 
@@ -304,789 +304,791 @@ msgstr "変換無しで挿入するファイル [%s から]"
 msgid "File to insert [from %s]"
 msgstr "読み込むファイル [from %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "無効な作業ディレクトリ\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "バックアップファイルの書き込みに失敗しました。保存を継続しますか? (分からない"
 "場合は N としてください。) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "無効なバックアップディレクトリ\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s の外部から書き込めません"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "バックアップファイル %s の書き込みエラー: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "バックアップファイルが多すぎませんか?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "テンポラリファイルの書き込みエラー: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "%s の書き込みエラー: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu 行を書き込みました"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS フォーマット]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac フォーマット]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [バックアップ]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "ファイルの先頭に追加"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "ファイルの末尾に追加"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "ファイルに書き込み"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "先頭に追加するファイル"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "末尾に追加するファイル"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "書き込むファイル"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "画面が狭すぎます"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "ファイルが存在し、上書きできません"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "ファイルを違う名前で保存しますか？ "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "ファイル \"%s\" が既に存在します、上書きしてよいですか？ "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "ディスク上でファイルが変更されました"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "ファイルを開いた後に修正が入りました、保存しますか？ "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(続き)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "終了"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "閉じる"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "貼り付け"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "動作を取り消します"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "ヘルプを表示"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "現在のバッファを閉じて nano を終了"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "現在のバッファ（またはマークした範囲）をディスクへ書き込み"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "他のファイルから現在のバッファ（または新しいバッファ）に読み込み"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "正規表現で文字列を前方に向かって検索"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "正規表現で文字列を後方に向かって検索"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "文字列を前方へ検索"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "文字列を後方へ検索"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "ファイルのリストを更新"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "左端の列へ移動"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "右端の列へ移動"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "最上段へ移動"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "最下段へ移動"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "前のページへ移動"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "次のページへ移動"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "現在の行（またはマークした範囲）を切り取ってカットバッファに格納する"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "切り取った行を貼り付ける"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "タブ文字の挿入"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "カーソル位置を表示"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "正規表現置換"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "指定位置へ移動"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "カーソル位置から始まる単語をマーク"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "現在の行（またはマークした範囲）をコピーしてカットバッファに格納する"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
-msgstr "現在行（またはマークされた行）をインデント"
+msgstr "現在行（またはマークされた範囲）を捨てる"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "現在行（またはマークされた行）をインデント"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "現在行（またはマークされた行）のインデントを縮小"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "直前の操作を取り消す (undo)"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "取り消した直前の操作をやり直す (redo)"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "前の文字へ戻る"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "次の文字へ進む"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "前の単語へ戻る"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "次の単語へ進む"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "前の行へ移動する"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "次の行へ移動する"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "現在行の先頭へ移動"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "現在行の末尾へ移動"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "前のテキストブロックへ移動する"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "次のテキストブロックへ移動する"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "段落の先頭へ移動、カーソルがその位置にある場合その前の段落へ移動"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "段落の末尾の次の位置へ移動、カーソルがその位置にある場合その次の段落へ移動"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "ファイルの先頭行へ移動"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "ファイルの最終行へ移動"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "対応する括弧へ移動"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "文中のカーソル位置を変えずに一行上にスクロールする"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "文中のカーソル位置を変えずに一行下にスクロールする"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "前のバッファに切替え"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "次のバッファに切替え"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "後に続く特殊キーをそのまま入力"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "タブ文字の挿入"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "行の挿入"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "カーソル位置の文字を削除"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "カーソルの前の文字を削除"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "カーソルから単語の先頭までを切り取る"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "カーソルから次の単語の先頭までを切り取る"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "カーソル位置からファイル終端までを切り取る"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "段落を均等割付"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "ファイル全体を均等割付"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "単語数、行数、文字数を表示"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "画面の更新"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "エディタを一時中断する (有効な場合)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "現在の単語の補完を試みる"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "現在行（またはマークされた行）をコメント/コメント解除"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "ファイルを確認なしで保存する"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "次を検索（前方へ）"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "次を検索（後方へ）"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "マクロの記録を開始/停止"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "直前に記録されたマクロを実行する"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "検索時に大文字小文字を区別をするかしないかを切り替える"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "検索方向の順逆を切り替える"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "正規表現を使用するかしないかを切り替える"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "前の検索文字 / 置換文字列を呼び出す"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "次の検索文字 / 置換文字列を呼び出す"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS フォーマットに切替え"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac フォーマットに切替え"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "ファイル末尾に追加する動作に切り替える"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "ファイル先頭に追加する動作に切り替える"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "元ファイルのバックアップを作成する動作に切り替える"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "外部コマンドの実行"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "現在のバッファ（またはマークした範囲）を指定したコマンドへパイプ送り"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "DOS/Mac フォーマットを変換しない"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "新しいバッファに切替え"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "変更を破棄して閉じる"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "ファイルブラウザの起動"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "ファイルブラウザの終了"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "リストの先頭に移動"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "リストの末尾に移動"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "リストの前のファイルへ移動"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "リストの次のファイルへ移動"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "ディレクトリに移動"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "構文チェッカを起動 (利用可能な場合)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "前の構文チェックメッセージへ"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "次の構文チェックメッセージへ"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "ヘルプ"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "書き込み"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "読み込み"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "均等割付"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "更新"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "検索"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "置換"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "ディレクトリに移動"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "切り取り"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "パイプに送る"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "スペル確認"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "カーソル位置"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "行を指定"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Undo"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Redo"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "マーク"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "コピー"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "大/小文字"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "正規表現"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "後方に"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "置換しない"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
-msgstr ""
+msgstr "古い方へ"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
-msgstr ""
+msgstr "新しい方へ"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "全て両端揃え"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "対の括弧へ"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "保存"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "検索（後方へ）"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "前へ"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "次へ"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "戻る"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "進む"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "前の単語"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "次の単語"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "先頭"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "末尾"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "前の行"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "次の行"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "上にスクロール"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "下にスクロール"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "前のテキストブロック"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "次のテキストブロック"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "段落の始点"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "段落の終点"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "前のページ"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "次のページ"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "先頭行"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "最終行"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "前のファイル"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "次のファイル"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "タブ"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "バックスペース"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "削除"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "左を切り取り"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "右を切り取り"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "末尾まで切り取り"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "単語の合計数"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "特殊キー入力"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "一時中断"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "インデント"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "インデント縮小"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "指定行をコメント"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "単語の補完"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "記録"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "マクロ実行"
 
-#: src/global.c:992
-#, fuzzy
+#: src/global.c:997
 msgid "Zap Text"
-msgstr "マーク"
+msgstr "テキストを消去"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "構文チェック"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "保存"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "検索"
@@ -1166,59 +1168,60 @@ msgstr "次の構文チェックメッセージ"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "ヘルプ"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "常にカーソル位置を表示"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "スムーズなスクロール"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "半画面ずつではなく1行ずつスクロールする"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "長い行を画面上で折り返す"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "空白を表示"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "単語の強調"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "スマートホームキー"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "自動インデント"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "改行の前まで削除"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "長い行を強制的に改行で折り返す"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "タブをスペースに変換"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "マウスのサポート"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "一時中断"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "行番号"
 
@@ -1478,14 +1481,19 @@ msgid ""
 "PageDown you can switch to earlier and later messages.\n"
 "\n"
 msgstr ""
+"=== 構文チェック ===\n"
+"\n"
+" このモードでは、ステータスバーにエラーメッセージまたは警告が表示され、カーソ"
+"ルはファイルの対応する位置に移動します。 PageUp と PageDown で前後のメッセー"
+"ジに移ることができます。\n"
+"\n"
 
 #: src/help.c:422
-#, fuzzy
 msgid ""
 " The following function keys are available in Linter mode:\n"
 "\n"
 msgstr ""
-" ファイルブラウザの検索コマンドでは以下のファンクションキーが使用できます。\n"
+" 構文チェックモードでは以下のファンクションキーが使用できます。\n"
 "\n"
 
 #: src/help.c:429
@@ -1572,19 +1580,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "'%s' の書き込み中にエラーが発生しました: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "ビューモードでそのキー入力は無効です"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "制限モードではこの機能は無効です"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "ヘルプはありません"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1593,7 +1601,7 @@ msgstr ""
 "\n"
 "バッファを %s へ書き込みました\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1602,7 +1610,7 @@ msgstr ""
 "\n"
 "バッファを書き込めません %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1611,7 +1619,7 @@ msgstr ""
 "\n"
 "バッファを %s へ書き込めません\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1622,7 +1630,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1632,7 +1640,7 @@ msgstr ""
 "ファイル名の前で指定してください。さらにカンマに続けて桁数も加えることができ"
 "ます。\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1641,282 +1649,296 @@ msgstr ""
 "ファイル名が '-' の時は、nano はデータを標準入力より読み込みます。\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "オプション\t\tGNUの長い形式のオプション\t\t説明\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "スマートホームキー有効"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "既存ファイルのバックアップを保存する"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "バックアップファイルを作成するディレクトリ"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "反転文字を太字で表示"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "タブをスペースに変換"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "デフォルトでファイルを新しいバッファに読み込む"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "(vim スタイルの) ロックファイルを使う"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "検索/置換した文字列の履歴を記録および読み取り"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "nanorc ファイルを参照しない"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "最上段へ移動"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "テンキーパッドの混乱の問題を修正する"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "ファイル末尾に空行を追加しない"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "強制改行で折り返す時に、末尾の空白を取り除く"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "DOS/Mac フォーマットを変換しない"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "編集エリアを一行広くする"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "カーソル位置を記録・読み込みする"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "検索に使用する正規表現"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "制限モード"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "半画面ずつではなく1行ずつスクロールする"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "タブ幅を #cols で指定"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "ステータスバーの表示を早く消す"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "バージョン情報を表示して終了する"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "単語の境界をより正確に抽出する"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "単語の一部とみなす文字の集合"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <name>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<name>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "表示色を決めるための構文定義"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
-msgstr ""
+msgstr "バックスペースとDelでマークした範囲を削除する"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "折り返し表示を空白にも適用する"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "長い行の強制改行をしない"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "常にカーソル位置を表示"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Del キーをバックスペースとして扱う"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
-#, fuzzy
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
-msgstr "ファイルブラウザの中でカーソルを表示"
+msgstr "ファイルブラウザとヘルプ文書の中でカーソルを表示"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "このヘルプを表示して終了"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "改行で自動インデント"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "行削除時に改行文字を削除しない"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "行頭に行番号を表示する"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "マウスを有効にする"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "ファイルを読み込まない（書き込みのみ）"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "作業ディレクトリを指定"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) および XOFF (^S) キーを維持する"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "強制改行の折り返し桁数を #cols に指定する"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "別のスペルチェッカを指定する"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "終了時に破棄の問い合わせをしない"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "ファイルをデフォルトで UNIX 形式で保存する"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "ビューモード(読み込み専用)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "長い行の強制改行をしない"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "キーのガイドを表示しない"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Right で単語の終わりに止まるようにします"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "一時中断を有効化する"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "長い行の画面上での折り返しを有効にする"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano バージョン %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s nano への貢献者たち\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1925,275 +1947,295 @@ msgstr ""
 "\n"
 " コンパイルオプション:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "ファイル名なし"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "変更されたバッファを保存しますか？(\"No\" と答えると変更は破棄されます。)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "標準入力から読み込んでいます; ^D または ^D^D で読み込みを終えます。\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "標準入力を開けません: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "申し訳ありませんが、キーボードからの標準入力を再オープンできません。\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ないし SIGTERM を受信しました\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Nano がクラッシュしてしまいました。  コード: %d。  バグ報告をしてください。\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "\"fg\" とタイプすることで nano を再開できます。\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "エディタの一時中断は無効です"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "使用する"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "使用しない"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "未割り当てのキー"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "未割り当てのキー: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "未割り当てのキー: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "未割り当てのキー: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "未割り当てのキー: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "未割り当てのキー: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "キー名 %s が正しくありません"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "要求されたタブのサイズ \"%s\" は不正です"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "要求されたサイズ \"%s\" は不正です"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "'%s -h' で指定可能なオプションを表示します。\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "不正な正規表現 \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "無効な行または列番号です"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "'%s' に間違いがあります"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "nano へようこそ。 Ctrl+G で簡単なヘルプが出ます。"
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "はい"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "いいえ"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "全て"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "エラー検出 %s の %zu 行目: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "引数 '%s' は \" で終端していません"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表現文字列は \" で括ってください"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "不正な正規表現 \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "構文名がありません"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "対になる引用符が構文名にありません"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 構文は予約語です"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" 構文は拡張子を受け付けません"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "キー名がみつかりません"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "キー名が短すぎます"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "キーバインドは \"^\", \"M\" ないし \"F\" で始めてください"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "キー名 %s が正しくありません"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "そのキーにバインドする機能を指定する必要があります"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "そのキーにバインド（または解除）するメニュー（または \"all\"）を指定する必要"
 "があります"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "マップ名 \"%s\" を機能にマップできません"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "マップ名 \"%s\" をメニューにマップできません"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "機能 \"%s\" はメニュー \"%s\" に含まれていません"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "残念ですが、キーストローク \"%s\" は再定義できません。"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "展開エラー %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "色 \"%s\" を解釈できません"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "背景色は明るい色ではいけません"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "'%s' コマンドには、先に 'syntax' コマンドが必要です"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "コマンド '%s' の後ろには正規表現文字列が必要です"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "空の正規表現文字列"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" には対応する \"end=\" が必要です"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "\"default\" 文法は 正規表現 '%s' を受け付けません "
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "'%s' の後ろには引数が必要です"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "引数 '%s' に閉じる \" が不足しています"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "キーはこの機能 '%s' に割り当てられていません（メニュー '%s'）。終了します。\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2201,58 +2243,58 @@ msgstr ""
 "必要であれば、nanorc の設定を調整する -I オプションを指定して nano を起動して"
 "ください。\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "展開するべき構文 \"%s\" が見つかりません"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "構文 \"%s\" は色のコマンドではありません"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "コマンド \"%s\" はインクルードファイル内では許可されていません"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "コマンド \"%s\" を解釈できません"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "オプションがありません"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知のオプション \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "オプション \"%s\" を解除できません"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "オプション \"%s\" には引数が必要です"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "引数が有効なマルチバイト文字ではありません"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "非空白類文字が必要です"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "2つの半角文字が必要です"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "ホームディレクトリが見つかりません"
 
@@ -2313,241 +2355,253 @@ msgstr "大括弧ではありません"
 msgid "No matching bracket"
 msgstr "大括弧が一致しません"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "マークセット"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "マーク解除"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"%s\" の呼び出しに失敗"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "コメントはこの種類のファイルではサポートされていません"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "ファイルの終端を超えてコメントすることはできません"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "undo バッファに何もありません!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "テキストの追加"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "改行"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "テキストの削除"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "選択範囲内:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "行の結合"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "テキストの置換"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "置換先を編集"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
-msgstr ""
+msgstr "抹消"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "テキストの切り取り"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "テキストの貼り付け"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "テキスト挿入"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "インデント"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "インデント縮小"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "コメント"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "コメント解除"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "操作 (%s) を取り消しました"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "やり直す操作はありません!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "操作 (%s) をやり直しました"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "pipe を作成できません"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "forkできません"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "フィルタリング"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "パイプを開けません: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "引用を示す文字の集合が正しく設定されていません %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "ファイル全体を均等割付"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "均等割付の取消可能"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "段落を均等割付"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "見つからない単語: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "置換先を編集"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "次の単語..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "スペルミスのある単語リストを作成しています。しばらくお待ちください..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "pipe バッファのサイズを取得できませんでした"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" の呼び出しに失敗"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" の呼び出しに失敗"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" の呼び出しに失敗"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "スペルチェック失敗: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "スペルチェック失敗: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "スペルチェック完了"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "この種類のファイルには、構文チェッカが定義されていません!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "構文チェックの前に変更されたバッファを保存しますか？"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "構文チェッカを起動中です、お待ちください"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "解析可能な行がコマンドの出力から得られませんでした: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "このメッセージは開いていないファイル \"%s\" についてのものです、新しいバッ"
 "ファで開きますか?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
-msgstr ""
+msgstr "このファイルに対するメッセージはありません"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "最初のメッセージへ"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "最後のメッセージへ"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%s単語数: %zu  行数: %zd  文字数: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "選択範囲内:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "特殊キー入力"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "書きかけの単語がありません"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "これ以上の一致はありません"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "一致するものがありません"
 
-#: src/utils.c:352 src/utils.c:364
-#, fuzzy
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
-msgstr "nano のメモリが足りなくなりました!"
+msgstr "nano のメモリが足りなくなりました!\n"
 
 #: src/winio.c:86
 msgid "Recording a macro..."
@@ -2566,85 +2620,131 @@ msgid "Macro is empty"
 msgstr "マクロは空です"
 
 #: src/winio.c:207
-#, fuzzy
 msgid "Too many errors from stdin\n"
-msgstr "標準入力からのエラーが多すぎます"
+msgstr "標準入力からのエラーが多すぎます\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "未知のシーケンス"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "ユニコード入力: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
-msgstr ""
+msgstr "構文チェック中 --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "ディレクトリ:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "変更済み"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "表示"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "制限モード"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "以降の警告は省略されました"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "行 %zd/%zd (%d%%), 列 %zu/%zu (%d%%), 文字 %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "nano テキストエディタ"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "バージョン"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "貢献してくれた方々:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "スペシャルサンクス:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "多くの翻訳者と Translation Project"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "ncurses に関して:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "および他のすべての方々..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "nano を使用していただきありがとうございます!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "貼り付け"
+
+#~ msgid "Unjustify"
+#~ msgstr "均等割付を戻す"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "切り取った行を貼り付ける"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "スムーズなスクロール"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "ファイル末尾に空行を追加しない"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "編集エリアを一行広くする"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "強制改行の折り返し桁数を #cols に指定する"
+
+#~ msgid "text add"
+#~ msgstr "テキストの追加"
+
+#~ msgid "text delete"
+#~ msgstr "テキストの削除"
+
+#~ msgid "text replace"
+#~ msgstr "テキストの置換"
+
+#~ msgid "text cut"
+#~ msgstr "テキストの切り取り"
+
+#~ msgid "text uncut"
+#~ msgstr "テキストの貼り付け"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "引用を示す文字の集合が正しく設定されていません %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "均等割付の取消可能"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "マルチバッファモードでの無効キー"
 
diff --git a/po/ko.po b/po/ko.po
@@ -0,0 +1,2684 @@
+# Korean translation for the nano package.
+# Copyright (C) 2019 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU nano 4.0-pre1\n"
+"Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-12 13:14+0900\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: src/browser.c:67
+#, c-format
+msgid "Cannot open directory: %s"
+msgstr "디렉터리를 열 수 없음: %s"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:228
+msgid "Go To Directory"
+msgstr "디렉터리로 이동"
+
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
+msgid "Cancelled"
+msgstr "취소함"
+
+#. TRANSLATORS: This refers to the confining effect of the
+#. * option --operatingdir, not of --restricted.
+#: src/browser.c:248 src/browser.c:279
+#, c-format
+msgid "Can't go outside of %s"
+msgstr "%s 밖으로 이동할 수 없습니다"
+
+#: src/browser.c:270
+msgid "Can't move up a directory"
+msgstr "상위 디렉터리로 이동할 수 없습니다"
+
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "%s 읽기 오류: %s"
+
+#: src/browser.c:369
+msgid "The working directory has disappeared"
+msgstr "작업 디렉터리가 사라졌습니다"
+
+#. TRANSLATORS: Try to keep this at most 7 characters.
+#: src/browser.c:563 src/browser.c:570
+msgid "(dir)"
+msgstr "(디렉터리)"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/browser.c:567
+msgid "(parent dir)"
+msgstr "(상위 디렉터리)"
+
+#. TRANSLATORS: Try to keep this at most 7 characters.
+#. * If necessary, you can leave out the parentheses.
+#: src/browser.c:597
+msgid "(huge)"
+msgstr "(매우 큼)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:682 src/search.c:103
+msgid "Search"
+msgstr "검색"
+
+#: src/browser.c:683 src/search.c:107
+msgid " [Backwards]"
+msgstr "[후위]"
+
+#: src/browser.c:722 src/browser.c:727 src/search.c:285
+msgid "Search Wrapped"
+msgstr "순환 검색"
+
+#: src/browser.c:738 src/search.c:418
+msgid "This is the only occurrence"
+msgstr "유일한 검색 결과입니다"
+
+#: src/browser.c:784 src/search.c:359
+msgid "No current search pattern"
+msgstr "현재 검색 패턴이 없습니다"
+
+#: src/color.c:184
+#, c-format
+msgid "Unknown syntax name: %s"
+msgstr "알 수 없는 문법 이름: %s"
+
+#: src/color.c:240
+#, c-format
+msgid "magic_load() failed: %s"
+msgstr "magic_load() 처리 실패: %s"
+
+#: src/color.c:244
+#, c-format
+msgid "magic_file(%s) failed: %s"
+msgstr "magic_file(%s) 처리 실패: %s"
+
+#: src/files.c:45
+#, c-format
+msgid "Directory '%s' does not exist"
+msgstr "'%s' 디렉터리가 없습니다"
+
+#: src/files.c:47
+#, c-format
+msgid "Path '%s': %s"
+msgstr "'%s' 경로: %s"
+
+#: src/files.c:49
+#, c-format
+msgid "Path '%s' is not a directory"
+msgstr "'%s' 경로는 디렉터리가 아닙니다"
+
+#: src/files.c:51
+#, c-format
+msgid "Path '%s' is not accessible"
+msgstr "'%s' 경로에 접근할 수 없습니다"
+
+#: src/files.c:53
+#, c-format
+msgid "Directory '%s' is not writable"
+msgstr "'%s' 디렉터리에 기록할 수 없습니다"
+
+#. TRANSLATORS: Keep the next eight messages at most 76 characters.
+#: src/files.c:186
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "파일을 잠글 사용자 식별자를 확인할 수 없음(getpwuid() 실패)"
+
+#: src/files.c:195
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "파일을 잠글 호스트 이름을 확인할 수 없음: %s"
+
+#: src/files.c:215 src/files.c:224 src/files.c:262 src/files.c:269
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "%s 잠금 파일 기록 오류: %s"
+
+#: src/files.c:291
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "%s 잠금 파일 삭제 오류: %s"
+
+#: src/files.c:322
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "%s 잠금 파일 열기 오류: %s"
+
+#: src/files.c:336
+#, 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:355
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %s); continue?"
+msgstr ""
+"%s 파일을 편집하고 있습니다(%s 사용자, %s 프로그램, PID %s). 계속하시겠습니"
+"까?"
+
+#: src/files.c:429
+#, c-format
+msgid "Can't read file from outside of %s"
+msgstr "%s 외부의 파일을 읽을 수 없습니다"
+
+#: src/files.c:445 src/files.c:1002 src/rcfile.c:510
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\"은(는) 디렉터리입니다"
+
+#: src/files.c:447
+#, c-format
+msgid "\"%s\" is not a normal file"
+msgstr "\"%s\"은(는) 일반 파일이 아닙니다"
+
+#: src/files.c:526 src/files.c:548 src/files.c:572 src/files.c:590
+msgid "spelling correction"
+msgstr "철자 수정"
+
+#. TRANSLATORS: first %s is file name, second %s is file format.
+#: src/files.c:623
+#, c-format
+msgid "%s -- %zu line (%s)"
+msgid_plural "%s -- %zu lines (%s)"
+msgstr[0] "%s -- %zu 행(%s)"
+
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
+msgid "New Buffer"
+msgstr "새 버퍼"
+
+#: src/files.c:626
+msgid "DOS"
+msgstr "도스"
+
+#: src/files.c:626
+msgid "Mac"
+msgstr "맥"
+
+#: src/files.c:629
+#, c-format
+msgid "%s -- %zu line"
+msgid_plural "%s -- %zu lines"
+msgstr[0] "%s -- %zu 행"
+
+#: src/files.c:640
+msgid "No more open file buffers"
+msgstr "더 이상 파일 열기 버퍼 없음"
+
+#: src/files.c:933
+#, c-format
+msgid "File '%s' is unwritable"
+msgstr "'%s' 파일에 기록할 수 없음"
+
+#. TRANSLATORS: Keep the next four messages at most 78 characters.
+#: src/files.c:937
+#, c-format
+msgid "Read %zu line (Converted from DOS and Mac format)"
+msgid_plural "Read %zu lines (Converted from DOS and Mac format)"
+msgstr[0] "%zu 행 읽음(도스 형식, 맥 형식에서 변환함)"
+
+#: src/files.c:942
+#, c-format
+msgid "Read %zu line (Converted from Mac format)"
+msgid_plural "Read %zu lines (Converted from Mac format)"
+msgstr[0] "%zu 행 읽음(맥 형식에서 변환함)"
+
+#: src/files.c:947
+#, c-format
+msgid "Read %zu line (Converted from DOS format)"
+msgid_plural "Read %zu lines (Converted from DOS format)"
+msgstr[0] "%zu 행 읽음(도스 형식에서 변환함)"
+
+#: src/files.c:953
+#, c-format
+msgid "Read %zu line"
+msgid_plural "Read %zu lines"
+msgstr[0] "%zu 행 읽음"
+
+#: src/files.c:988
+msgid "New File"
+msgstr "새 파일"
+
+#: src/files.c:993
+#, c-format
+msgid "File \"%s\" not found"
+msgstr "\"%s\" 파일이 없습니다"
+
+#: src/files.c:1003 src/rcfile.c:511
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" 파일은 장치 파일입니다"
+
+#: src/files.c:1021
+msgid "Reading File"
+msgstr "파일 읽는 중"
+
+#. TRANSLATORS: The next six messages are prompts.
+#: src/files.c:1087
+msgid "Command to execute in new buffer"
+msgstr "새 버퍼에 실행할 명령"
+
+#: src/files.c:1090
+msgid "Command to execute"
+msgstr "실행할 명령"
+
+#: src/files.c:1098
+#, c-format
+msgid "File to read unconverted into new buffer [from %s]"
+msgstr "[%s에서] 새 버퍼로 변환하지 않고 읽을 파일"
+
+#: src/files.c:1101
+#, c-format
+msgid "File to read into new buffer [from %s]"
+msgstr "[%s에서] 새 버퍼로 읽을 파일"
+
+#: src/files.c:1106
+#, c-format
+msgid "File to insert unconverted [from %s]"
+msgstr "[%s에서] 변환하지 않고 삽입할 파일"
+
+#: src/files.c:1109
+#, c-format
+msgid "File to insert [from %s]"
+msgstr "[%s에서] 삽입할 파일"
+
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "잘못된 처리 디렉터리: %s\n"
+
+#: src/files.c:1517
+msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
+msgstr "백업 파일 기록 실패. 계속 저장하시겠습니까? (잘 모르겠으면 N을 입력) "
+
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "잘못된 백업 디렉터리: %s\n"
+
+#: src/files.c:1628
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "%s 외부에 기록할 수 없습니다"
+
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "%s 백업 파일 기록 오류: %s"
+
+#: src/files.c:1707 src/nano.c:656
+msgid "Too many backup files?"
+msgstr "백업 파일이 너무 많지 않습니까?"
+
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "임시 파일 기록 오류: %s"
+
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "%s 기록 오류: %s"
+
+#: src/files.c:2028
+#, c-format
+msgid "Wrote %zu line"
+msgid_plural "Wrote %zu lines"
+msgstr[0] "%zu 행 기록함"
+
+#: src/files.c:2109
+msgid " [DOS Format]"
+msgstr " [도스 형식]"
+
+#: src/files.c:2110
+msgid " [Mac Format]"
+msgstr " [맥 형식]"
+
+#: src/files.c:2111
+msgid " [Backup]"
+msgstr "[백업]"
+
+#. TRANSLATORS: The next six strings are prompts.
+#: src/files.c:2118
+msgid "Prepend Selection to File"
+msgstr "선택 영역 파일 앞부분에 덧붙이기"
+
+#: src/files.c:2119
+msgid "Append Selection to File"
+msgstr "선택 영역 파일 뒷부분에 덧붙이기"
+
+#: src/files.c:2120
+msgid "Write Selection to File"
+msgstr "선택 영역 파일에 기록"
+
+#: src/files.c:2122
+msgid "File Name to Prepend to"
+msgstr "앞에 덧붙일 파일 이름"
+
+#: src/files.c:2123
+msgid "File Name to Append to"
+msgstr "뒤에 덧붙일 파일 이름"
+
+#: src/files.c:2126
+msgid "File Name to Write"
+msgstr "기록할 파일 이름"
+
+#. TRANSLATORS: Concisely say the screen is too small.
+#: src/files.c:2209
+msgid "Too tiny"
+msgstr "너무 작습니다"
+
+#. TRANSLATORS: Restricted mode forbids overwriting.
+#: src/files.c:2239
+msgid "File exists -- cannot overwrite"
+msgstr "파일이 이미 있습니다 -- 덮어쓰기 불가"
+
+#: src/files.c:2249
+msgid "Save file under DIFFERENT NAME? "
+msgstr "*다른 이름*으로 파일을 저장하시겠습니까?"
+
+#: src/files.c:2257
+#, c-format
+msgid "File \"%s\" exists; OVERWRITE? "
+msgstr "\"%s\" 파일이 이미 있습니다. *덮어쓰*시겠습니까?"
+
+#: src/files.c:2283
+msgid "File on disk has changed"
+msgstr "디스크의 파일 내용이 바뀌었습니다"
+
+#: src/files.c:2285
+msgid "File was modified since you opened it; continue saving? "
+msgstr "이 파일을 열고난 후 파일을 수정했습니다. 계속 저장하시겠습니까? "
+
+#: src/files.c:2703
+msgid "(more)"
+msgstr "(더 보기)"
+
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
+msgid "Exit"
+msgstr "나가기"
+
+#: src/global.c:524
+msgid "Close"
+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:532
+msgid "Cancel the current function"
+msgstr "현재 기능을 취소합니다"
+
+#: src/global.c:533
+msgid "Display this help text"
+msgstr "이 도움말 텍스트를 표시합니다"
+
+#: src/global.c:535
+msgid "Close the current buffer / Exit from nano"
+msgstr "현재 버퍼를 닫고 나노를 빠져나갑니다"
+
+#: src/global.c:537
+msgid "Write the current buffer (or the marked region) to disk"
+msgstr "현재 버퍼(또는 표시 영역)를 디스크에 기록합니다"
+
+#: src/global.c:539
+msgid "Insert another file into current buffer (or into new buffer)"
+msgstr "다른 파일을 현재 버퍼(또는 새 버퍼)에 삽입합니다"
+
+#: src/global.c:541
+msgid "Search forward for a string or a regular expression"
+msgstr "지정 문자열 또는 정규 표현식에 대해 다음 방향으로 검색합니다"
+
+#: src/global.c:543
+msgid "Search backward for a string or a regular expression"
+msgstr "지정 문자열 또는 정규 표현식에 대해 이전 방향으로 검색합니다"
+
+#: src/global.c:545
+msgid "Search forward for a string"
+msgstr "문자열에 대해 다음 방향으로 검색합니다"
+
+#: src/global.c:546
+msgid "Search backward for a string"
+msgstr "문자열에 대한 이전 방향으로 검색합니다"
+
+#: src/global.c:547
+msgid "Refresh the file list"
+msgstr "파일 목록을 새로 고칩니다"
+
+#: src/global.c:549
+msgid "Go to lefthand column"
+msgstr "좌측열로 이동합니다"
+
+#: src/global.c:550
+msgid "Go to righthand column"
+msgstr "우측열로 이동합니다"
+
+#: src/global.c:551
+msgid "Go to first row in this column"
+msgstr "이 컬럼의 처음 행으로 이동합니다"
+
+#: src/global.c:552
+msgid "Go to last row in this column"
+msgstr "이 컬럼의 마지막 행으로 이동합니다"
+
+#: src/global.c:555
+msgid "Go one screenful up"
+msgstr "화면 단위 위로 한번 이동합니다"
+
+#: src/global.c:556
+msgid "Go one screenful down"
+msgstr "화면 단위 아래로 한번 이동합니다"
+
+#: src/global.c:558
+msgid "Cut current line (or marked region) and store it in cutbuffer"
+msgstr "현재 행(또는 표시 구역)을 잘라내고 잘라내기 버퍼에 저장합니다"
+
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "잘라내기 버퍼의 내용을 현재 커서 위치에 붙여넣습니다"
+
+#: src/global.c:561
+msgid "Display the position of the cursor"
+msgstr "커서 위치를 표시합니다"
+
+#: src/global.c:563
+msgid "Invoke the spell checker, if available"
+msgstr "가능하면 문법 검사기를 실행합니다"
+
+#: src/global.c:565
+msgid "Replace a string or a regular expression"
+msgstr "문자 또는 정규식 조건에 따라 바꿉니다"
+
+#: src/global.c:566
+msgid "Go to line and column number"
+msgstr "지정 행 열 번호로 이동합니다"
+
+#: src/global.c:568
+msgid "Mark text starting from the cursor position"
+msgstr "커서 위치를 텍스트 시작 위치로 표시합니다"
+
+#: src/global.c:570
+msgid "Copy current line (or marked region) and store it in cutbuffer"
+msgstr "현재 줄(또는 표시 구역) 복사 후 잘라내기 버퍼에 저장합니다"
+
+#: src/global.c:571
+msgid "Throw away the current line (or marked region)"
+msgstr "현재 줄(또는 표시 구역)을 버립니다"
+
+#: src/global.c:572
+msgid "Indent the current line (or marked lines)"
+msgstr "현재 행(또는 표시행)을 들여쓰기 방향으로 움직입니다"
+
+#: src/global.c:573
+msgid "Unindent the current line (or marked lines)"
+msgstr "현재 행(또는 표시행)을 내어쓰기 방향으로 움직입니다"
+
+#: src/global.c:574
+msgid "Undo the last operation"
+msgstr "마지막 동작을 취소합니다"
+
+#: src/global.c:575
+msgid "Redo the last undone operation"
+msgstr "마지막 취소 동작을 다시 실행합니다"
+
+#: src/global.c:577
+msgid "Go back one character"
+msgstr "한 문자 이전으로 이동합니다"
+
+#: src/global.c:578
+msgid "Go forward one character"
+msgstr "한 문자 앞으로 이동합니다"
+
+#: src/global.c:579
+msgid "Go back one word"
+msgstr "한 단어 이전으로 이동합니다"
+
+#: src/global.c:580
+msgid "Go forward one word"
+msgstr "한 단어 앞으로 이동합니다"
+
+#: src/global.c:581
+msgid "Go to previous line"
+msgstr "이전 줄로 이동합니다"
+
+#: src/global.c:582
+msgid "Go to next line"
+msgstr "다음 줄로 이동합니다"
+
+#: src/global.c:583
+msgid "Go to beginning of current line"
+msgstr "현재 줄 처음으로 이동합니다"
+
+#: src/global.c:584
+msgid "Go to end of current line"
+msgstr "현재 줄 끝으로 이동합니다"
+
+#: src/global.c:585
+msgid "Go to previous block of text"
+msgstr "이전 텍스트 블록으로 이동합니다"
+
+#: src/global.c:586
+msgid "Go to next block of text"
+msgstr "다음 텍스트 블록으로 이동합니다"
+
+#: src/global.c:589
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "문단 처음으로 이동 후 이전 문단으로 이동합니다"
+
+#: src/global.c:591
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr "문단 끝 다음으로 이동 후 다음 문단으로 이동합니다"
+
+#: src/global.c:593
+msgid "Go to the first line of the file"
+msgstr "파일의 처음 줄로 이동합니다"
+
+#: src/global.c:594
+msgid "Go to the last line of the file"
+msgstr "파일의 마지막 줄로 이동합니다"
+
+#: src/global.c:596
+msgid "Go to the matching bracket"
+msgstr "일치하는 각괄호 위치로 이동합니다"
+
+#: src/global.c:600
+msgid "Scroll up one line without moving the cursor textually"
+msgstr "커서를 실제로 이동하지 않고 스크롤 위로 이동합니다"
+
+#: src/global.c:602
+msgid "Scroll down one line without moving the cursor textually"
+msgstr "커서를 실제로 이동하지 않고 스크롤 아래로 이동합니다"
+
+#: src/global.c:605
+msgid "Switch to the previous file buffer"
+msgstr "이전 파일 버퍼로 전환합니다"
+
+#: src/global.c:606
+msgid "Switch to the next file buffer"
+msgstr "다음 파일 버퍼로 전환합니다"
+
+#: src/global.c:608
+msgid "Insert the next keystroke verbatim"
+msgstr "다음 키 입력 그대로 삽입합니다"
+
+#: src/global.c:609
+msgid "Insert a tab at the cursor position"
+msgstr "현재 커서 위치에 탭 간격을 넣습니다"
+
+#: src/global.c:610
+msgid "Insert a newline at the cursor position"
+msgstr "현재 커서 위치에서 줄을 바꿉니다"
+
+#: src/global.c:611
+msgid "Delete the character under the cursor"
+msgstr "현재 커서 위치의 문자를 삭제합니다"
+
+#: src/global.c:613
+msgid "Delete the character to the left of the cursor"
+msgstr "현재 커서 위치 좌측의 문자를 삭제합니다"
+
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "현재 커서 위치에서 앞 단어 시작 부분까지 삭제합니다"
+
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "현재 커서 위치에서 다음 단어 시작 부분까지 삭제합니다"
+
+#: src/global.c:620
+msgid "Cut from the cursor position to the end of the file"
+msgstr "현재 커서 위치에서 파일 끝까지 내용을 잘라냅니다"
+
+#: src/global.c:623
+msgid "Justify the current paragraph"
+msgstr "현재 문단을 정렬합니다"
+
+#: src/global.c:624
+msgid "Justify the entire file"
+msgstr "파일 전체를 정렬합니다"
+
+#: src/global.c:628
+msgid "Count the number of words, lines, and characters"
+msgstr "단어, 행, 문자 갯수를 셉니다"
+
+#: src/global.c:631
+msgid "Refresh (redraw) the current screen"
+msgstr "현재 화면을 새로 고칩니다(새로 그림)"
+
+#: src/global.c:633
+msgid "Suspend the editor (if suspension is enabled)"
+msgstr "편집기 동작을 잠시 멈춥니다(잠시 멈춤 활성화했을 때)"
+
+#: src/global.c:635
+msgid "Try and complete the current word"
+msgstr "현재 단어 완성을 시도합니다"
+
+#: src/global.c:639
+msgid "Comment/uncomment the current line (or marked lines)"
+msgstr "현재 행(또는 표시행)을 주석처리/주석해제 합니다"
+
+#: src/global.c:641
+msgid "Save file without prompting"
+msgstr "묻지 않고 파일을 저장합니다"
+
+#: src/global.c:642
+msgid "Search next occurrence backward"
+msgstr "이전 대상을 검색합니다"
+
+#: src/global.c:643
+msgid "Search next occurrence forward"
+msgstr "다음 대상을 검색합니다"
+
+#: src/global.c:645
+msgid "Start/stop recording a macro"
+msgstr "매크로 기록을 시작/정지합니다"
+
+#: src/global.c:646
+msgid "Run the last recorded macro"
+msgstr "마지막으로 기록한 매크로를 실행합니다"
+
+#: src/global.c:649
+msgid "Toggle the case sensitivity of the search"
+msgstr "검색시 대소문자 구별 여부 설정을 전환합니다"
+
+#: src/global.c:651
+msgid "Reverse the direction of the search"
+msgstr "검색 방향을 뒤로 돌립니다"
+
+#: src/global.c:653
+msgid "Toggle the use of regular expressions"
+msgstr "정규표현식 사용 여부 설정을 전환합니다"
+
+#: src/global.c:656
+msgid "Recall the previous search/replace string"
+msgstr "문자열 이전 검색/바꾸기를 다시 호출합니다"
+
+#: src/global.c:658
+msgid "Recall the next search/replace string"
+msgstr "문자열 다음 검색/바꾸기를 다시 호출합니다"
+
+#: src/global.c:661
+msgid "Toggle the use of DOS format"
+msgstr "도스 형식 사용 여부 설정을 전환합니다"
+
+#: src/global.c:662
+msgid "Toggle the use of Mac format"
+msgstr "맥 형식 사용 여부 설정을 전환합니다"
+
+#: src/global.c:663
+msgid "Toggle appending"
+msgstr "뒷 부분 붙이기 여부 설정을 전환합니다"
+
+#: src/global.c:664
+msgid "Toggle prepending"
+msgstr "앞 부분 붙이기 여부 설정을 전환합니다"
+
+#: src/global.c:665
+msgid "Toggle backing up of the original file"
+msgstr "원본 파일 백업 여부 설정을 전환합니다"
+
+#: src/global.c:666
+msgid "Execute external command"
+msgstr "외부 명령을 실행합니다"
+
+#: src/global.c:668
+msgid "Pipe the current buffer (or marked region) to the command"
+msgstr "현재 버퍼(또는 표시 영역)을 명령으로 보냅니다"
+
+#: src/global.c:669
+msgid "Do not convert from DOS/Mac format"
+msgstr "도스/맥 형식에서 변환하지 않습니다"
+
+#: src/global.c:672
+msgid "Toggle the use of a new buffer"
+msgstr "새 버퍼 사용 여부 설정을 전환합니다"
+
+#: src/global.c:674
+msgid "Close buffer without saving it"
+msgstr "저장하지 않고 버퍼를 닫습니다"
+
+#: src/global.c:676
+msgid "Go to file browser"
+msgstr "파일 탐색기로 이동합니다"
+
+#: src/global.c:677
+msgid "Exit from the file browser"
+msgstr "파일 탐색기에서 나갑니다"
+
+#: src/global.c:678
+msgid "Go to the first file in the list"
+msgstr "목록의 첫번째 파일로 이동합니다"
+
+#: src/global.c:679
+msgid "Go to the last file in the list"
+msgstr "목록의 마지막 파일로 이동합니다"
+
+#: src/global.c:680
+msgid "Go to the previous file in the list"
+msgstr "목록의 이전 파일로 이동합니다"
+
+#: src/global.c:681
+msgid "Go to the next file in the list"
+msgstr "목록의 다음 파일로 이동합니다"
+
+#: src/global.c:682
+msgid "Go to directory"
+msgstr "디렉터리로 이동합니다"
+
+#: src/global.c:685
+msgid "Invoke the linter, if available"
+msgstr "가능하다면 분석 도구 실행"
+
+#: src/global.c:686
+msgid "Go to previous linter msg"
+msgstr "이전 분석 도구 메시지로 이동"
+
+#: src/global.c:687
+msgid "Go to next linter msg"
+msgstr "다음 분석 도구 메시지로 이동"
+
+#. TRANSLATORS: Try to keep the next ninety strings or so at most 10
+#. * characters.  Some strings may be longer -- run nano and see.
+#: src/global.c:702
+msgid "Get Help"
+msgstr "도움말 보기"
+
+#: src/global.c:705 src/prompt.c:695
+msgid "Cancel"
+msgstr "취소"
+
+#: src/global.c:718
+msgid "Write Out"
+msgstr "기록 내보내기"
+
+#: src/global.c:728 src/global.c:1050
+msgid "Read File"
+msgstr "파일 읽기"
+
+#: src/global.c:735 src/global.c:769
+msgid "Justify"
+msgstr "정렬"
+
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
+msgid "Refresh"
+msgstr "새로 고침"
+
+#: src/global.c:747 src/global.c:835
+msgid "Where Is"
+msgstr "현재 위치"
+
+#: src/global.c:750 src/global.c:808
+msgid "Replace"
+msgstr "바꾸기"
+
+#: src/global.c:754
+msgid "Go To Dir"
+msgstr "디렉터리로 이동"
+
+#: src/global.c:761
+msgid "Cut Text"
+msgstr "텍스트 잘라내기"
+
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "텍스트 붙여넣기"
+
+#: src/global.c:773
+msgid "To Spell"
+msgstr "해당 철자로"
+
+#: src/global.c:778
+msgid "Cur Pos"
+msgstr "커서 위치"
+
+#: src/global.c:785 src/global.c:821 src/global.c:926
+msgid "Go To Line"
+msgstr "지정 행으로 이동"
+
+#: src/global.c:790
+msgid "Undo"
+msgstr "실행 취소"
+
+#: src/global.c:792
+msgid "Redo"
+msgstr "다시 실행"
+
+#: src/global.c:795
+msgid "Mark Text"
+msgstr "텍스트 표시"
+
+#: src/global.c:797
+msgid "Copy Text"
+msgstr "텍스트 복사"
+
+#: src/global.c:801
+msgid "Case Sens"
+msgstr "대소문구별"
+
+#: src/global.c:803
+msgid "Regexp"
+msgstr "정규식"
+
+#: src/global.c:805
+msgid "Backwards"
+msgstr "후위"
+
+#: src/global.c:811
+msgid "No Replace"
+msgstr "바꾼 항목 없음"
+
+#: src/global.c:815
+msgid "Older"
+msgstr "이전 기록"
+
+#: src/global.c:817
+msgid "Newer"
+msgstr "최근 기록"
+
+#: src/global.c:825 src/global.c:957
+msgid "FullJstify"
+msgstr "전체 정렬"
+
+#: src/global.c:830
+msgid "To Bracket"
+msgstr "각 괄호로 이동"
+
+#. TRANSLATORS: This starts a backward search.
+#: src/global.c:837 src/global.c:843 src/global.c:857
+msgid "Where Was"
+msgstr "이전 위치"
+
+#. TRANSLATORS: This refers to searching the preceding occurrence.
+#: src/global.c:847
+msgid "Previous"
+msgstr "이전"
+
+#: src/global.c:850 src/global.c:855
+msgid "Next"
+msgstr "다음"
+
+#. TRANSLATORS: This means move the cursor one character back.
+#: src/global.c:864 src/global.c:869
+msgid "Back"
+msgstr "한 단어 뒤로"
+
+#: src/global.c:866 src/global.c:871
+msgid "Forward"
+msgstr "앞으로"
+
+#: src/global.c:875
+msgid "Prev Word"
+msgstr "이전 단어"
+
+#: src/global.c:877
+msgid "Next Word"
+msgstr "다음 단어"
+
+#: src/global.c:880
+msgid "Home"
+msgstr "Home"
+
+#: src/global.c:882
+msgid "End"
+msgstr "End"
+
+#: src/global.c:885
+msgid "Prev Line"
+msgstr "이전 행"
+
+#: src/global.c:887
+msgid "Next Line"
+msgstr "다음 행"
+
+#: src/global.c:890
+msgid "Scroll Up"
+msgstr "스크롤 위로 이동"
+
+#: src/global.c:892
+msgid "Scroll Down"
+msgstr "스크롤 아래로 이동"
+
+#: src/global.c:896
+msgid "Prev Block"
+msgstr "이전 블록"
+
+#: src/global.c:898
+msgid "Next Block"
+msgstr "다음 블록"
+
+#: src/global.c:901
+msgid "Beg of Par"
+msgstr "단락 시작"
+
+#: src/global.c:903
+msgid "End of Par"
+msgstr "단락 끝"
+
+#: src/global.c:907 src/global.c:1060
+msgid "Prev Page"
+msgstr "이전 페이지"
+
+#: src/global.c:909 src/global.c:1062
+msgid "Next Page"
+msgstr "다음 페이지"
+
+#: src/global.c:912
+msgid "First Line"
+msgstr "처음 행"
+
+#: src/global.c:914
+msgid "Last Line"
+msgstr "마지막 행"
+
+#: src/global.c:918
+msgid "Prev File"
+msgstr "이전 파일"
+
+#: src/global.c:920
+msgid "Next File"
+msgstr "다음 파일"
+
+# NOTE: DO NOT TRANSLATE - Key Name
+#: src/global.c:930
+msgid "Tab"
+msgstr "Tab"
+
+# NOTE: DO NOT TRANSLATE - Key Name
+#: src/global.c:932
+msgid "Enter"
+msgstr "Enter"
+
+# NOTE: DO NOT TRANSLATE - Key Name
+#: src/global.c:935
+msgid "Backspace"
+msgstr "Backspace"
+
+# NOTE: DO NOT TRANSLATE - Key Name
+#: src/global.c:937
+msgid "Delete"
+msgstr "Delete"
+
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "왼쪽 자르기"
+
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "오른쪽 자르기"
+
+#: src/global.c:952
+msgid "CutTillEnd"
+msgstr "마지막까지 자르기"
+
+#: src/global.c:962
+msgid "Word Count"
+msgstr "단어 계수"
+
+#: src/global.c:966
+msgid "Verbatim"
+msgstr "입력 그대로"
+
+#: src/global.c:974
+msgid "Suspend"
+msgstr "잠시 멈춤"
+
+#: src/global.c:978
+msgid "Indent"
+msgstr "들여쓰기"
+
+#: src/global.c:980
+msgid "Unindent"
+msgstr "내어쓰기"
+
+#: src/global.c:984
+msgid "Comment Lines"
+msgstr "행 주석 처리"
+
+#: src/global.c:988
+msgid "Complete"
+msgstr "완료"
+
+#: src/global.c:992
+msgid "Record"
+msgstr "기록"
+
+#: src/global.c:994
+msgid "Run Macro"
+msgstr "매크로 실행"
+
+#: src/global.c:997
+msgid "Zap Text"
+msgstr "텍스트 없애기"
+
+#: src/global.c:1002
+msgid "To Linter"
+msgstr "분석 도구로"
+
+#: src/global.c:1006
+msgid "Save"
+msgstr "저장"
+
+#: src/global.c:1009
+msgid "Go To Text"
+msgstr "지정 텍스트로 이동"
+
+#: src/global.c:1013
+msgid "DOS Format"
+msgstr "도스 형식"
+
+#: src/global.c:1015
+msgid "Mac Format"
+msgstr "맥 형식"
+
+#: src/global.c:1023
+msgid "Append"
+msgstr "뒤에 붙여넣기"
+
+#: src/global.c:1025
+msgid "Prepend"
+msgstr "앞에 붙여넣기"
+
+#: src/global.c:1028
+msgid "Backup File"
+msgstr "백업 파일"
+
+#: src/global.c:1039
+msgid "No Conversion"
+msgstr "변환 안함"
+
+#: src/global.c:1044
+msgid "Execute Command"
+msgstr "명령 실행"
+
+#: src/global.c:1047
+msgid "Pipe Text"
+msgstr "텍스트 내보내기"
+
+#: src/global.c:1057
+msgid "To Files"
+msgstr "파일로"
+
+#: src/global.c:1065
+msgid "First File"
+msgstr "처음 파일"
+
+#: src/global.c:1067
+msgid "Last File"
+msgstr "마지막 파일"
+
+#: src/global.c:1070
+msgid "Left Column"
+msgstr "좌측 열"
+
+#: src/global.c:1072
+msgid "Right Column"
+msgstr "우측 열"
+
+#: src/global.c:1074
+msgid "Top Row"
+msgstr "상단 행"
+
+#: src/global.c:1076
+msgid "Bottom Row"
+msgstr "하단 행"
+
+#: src/global.c:1081
+msgid "Discard buffer"
+msgstr "버퍼 내용 버리기"
+
+#. TRANSLATORS: Try to keep the next two strings at most 20 characters.
+#: src/global.c:1086
+msgid "Prev Lint Msg"
+msgstr "이전 분석 도구 메시지"
+
+#: src/global.c:1088
+msgid "Next Lint Msg"
+msgstr "다음 분석 도구 메시지"
+
+#. TRANSLATORS: The next fourteen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1408
+msgid "Help mode"
+msgstr "도움말 모드"
+
+#: src/global.c:1410
+msgid "Constant cursor position display"
+msgstr "커서 위치 항상 표시"
+
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "건너뛰는 스크롤 이동(화면 높이 절반)"
+
+#: src/global.c:1414
+msgid "Soft wrapping of overlong lines"
+msgstr "줄 길이를 넘어가는 줄 나누기"
+
+#: src/global.c:1416
+msgid "Whitespace display"
+msgstr "공백 영역 표시"
+
+#: src/global.c:1418
+msgid "Color syntax highlighting"
+msgstr "색 문법 강조"
+
+#: src/global.c:1420
+msgid "Smart home key"
+msgstr "똑똑한 Home 키"
+
+#: src/global.c:1422
+msgid "Auto indent"
+msgstr "자동 들여쓰기"
+
+#: src/global.c:1424
+msgid "Cut to end"
+msgstr "마지막까지 자르기"
+
+#: src/global.c:1426
+msgid "Hard wrapping of overlong lines"
+msgstr "줄 길이를 넘어가는 줄 강제 개행"
+
+#: src/global.c:1428
+msgid "Conversion of typed tabs to spaces"
+msgstr "탭 입력을 단일 공백으로 변환"
+
+#: src/global.c:1430
+msgid "Mouse support"
+msgstr "마우스 지원"
+
+#: src/global.c:1432
+msgid "Suspension"
+msgstr "잠시 멈춤"
+
+#: src/global.c:1434
+msgid "Line numbering"
+msgstr "행 번호 표시"
+
+#: src/help.c:299
+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"
+"검색할 단어나 문자를 입력하고 Enter를 누르십시오.  입력한 내용과 일치하는 부"
+"분을 찾으면, 검색 문자열과 일치하는 부분에 가까운 위치로 화면이 새로 바뀝니"
+"다.\n"
+"\n"
+"\n"
+"이전 검색 문자열은 검색 프롬프트 다음에 각 괄호에 둘러싸여 나타납니다.  어떤 "
+"텍스트도 입력하지 않고 계속 Enter 키를 치면 앞선 검색 동작을 계속 진행합니"
+"다.  "
+
+#: src/help.c:308
+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:314
+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"
+"이동하려는 행 번호를 입력하고 Enter 키를 누르십시오. 입력한 번호보다 행 수가 "
+"적으면 파일 마지막 줄로 이동합니다.\n"
+"\n"
+"다음 기능 키를 행 이동 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:323
+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"
+"나노에 다중 파일 버퍼 지원을 컴파일했고, 명령행에서 -F 또는 --multibuffer 명"
+"령행 플래그를 넣었다면 다중 파일 버퍼 기능을 쓸 수 있습니다. Meta-F 토글, "
+"nanorc 파일에서 파일 내용을 넣으면 개별 버퍼에 불러올 수 있습니다(Meta-< 와 "
+"Meta-> 로 파일 버퍼를 이동할 수 있습니다).  "
+
+#: src/help.c:332
+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 ""
+"다른 빈 버퍼가 필요하다면, 파일 이름을 입력하지 않거나 없는 파일 이름을 프롬"
+"프트에 입력 후 Enter 키를 누르십시오.\n"
+"\n"
+"다음 기능 키를 파일 삽입 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:338
+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"
+"현재 파일 내용을 저장할 다른 파일의 이름을 입력하고 Enter 키를 눌러 파일을 저"
+"장하십시오.\n"
+"\n"
+"텍스트를 선택 표시했을 경우 선택한 부분만 다른 파일에 저장할 지 불어봅니다.  "
+"현재 파일에 해당 부분을 덮어쓰는 일을 막으려, 이 모드에서는 현재 파일 이름을 "
+"기본값으로 하지 않습니다.\n"
+"\n"
+"다음 기능 키를 파일 기록 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:352
+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"
+"파일 브라우저는 읽고 쓸 파일을 선택할 디렉터리 구조를 띄워 탐색하는데 씁니"
+"다.  파일을 찾아보려면 화살표 키 또는 Page Up/Page Down 키를 쓰고, 파일을 선"
+"택하려면 S 또는 Enter키를, 디렉터리를 선택하려면 Enter 키를 씁니다.  한 단계 "
+"위로 이동하려면 목록 상단의 \"..\" 디렉터리를 선택합니다.\n"
+"\n"
+"다음 기능 키를 파일 브라우저에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:365
+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"
+"찾으려는 단어 또는 문자를 입력한 후 Enter 키를 누르십시오. 입력한 텍스트와 일"
+"치하는 항목이 있다면, 화면은 해당 문자열과 일치하는 위치 근처로 바뀝니다.\n"
+"\n"
+"\n"
+"이전 검색 문자열은 검색 프롬프트 다음 각 괄호에 둘러싸입니다.  어떤 텍스트도 "
+"입력하지 않고 계속 Enter 키를 치면 앞선 검색 동작을 계속 진행합니다.\n"
+"\n"
+
+#: src/help.c:374
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" 다음 기능 키를 브라우저 검색 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:378
+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 키로 디렉터리 이름을 자동으로 완성(시도)"
+"할 수 있습니다.\n"
+"\n"
+"다음 기능 키를 브라우저 디렉터리 이동 모드에서 쓸 수 있습니다:\n"
+
+#: src/help.c:391
+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:406
+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 into a new buffer).  If the command is preceded "
+"by '|' (the pipe symbol), the current contents of the buffer (or marked "
+"region) will be piped to the command.  "
+msgstr ""
+"명령 실행 도움말 텍스트\n"
+"\n"
+"이 모드에서는 현재 버퍼(또는 새 버퍼)로 셸에서 실행한 명령 출력을 삽입할 수 "
+"있습니다.  명령 앞에 '|'(파이프 기호)가 붙을 경우, 현재 버퍼 내용(또는 선택 "
+"영역)을 명령으로 내보냅니다.  "
+
+#: src/help.c:412
+msgid ""
+"If you just need another blank buffer, do not enter any command.\n"
+"\n"
+msgstr ""
+"다른 빈 버퍼가 필요하다면, 어떤 명령도 입력하지 마십시오.\n"
+"\n"
+
+#: src/help.c:414
+msgid ""
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+" 다음 기능 키를 명령 실행 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:417
+msgid ""
+"=== Linter ===\n"
+"\n"
+" In this mode, the status bar shows an error message or warning, and the "
+"cursor is put at the corresponding position in the file.  With PageUp and "
+"PageDown you can switch to earlier and later messages.\n"
+"\n"
+msgstr ""
+"=== 분석 도구 ===\n"
+"\n"
+"이 모드에서, 상태 표시줄은 오류 메시지 또는 경고를 나타내며, 파일의 해당 위치"
+"에 커서가 놓입니다.  Page Up키와 Page Down키를 사용하여 이전/이후의 메시지로 "
+"전환할 수 있습니다.\n"
+"\n"
+
+#: src/help.c:422
+msgid ""
+" The following function keys are available in Linter mode:\n"
+"\n"
+msgstr ""
+"다음 기능 키를 분석 도구 모드에서 쓸 수 있습니다:\n"
+"\n"
+
+#: src/help.c:429
+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 ""
+"나노 전면 도움말 텍스트\n"
+"\n"
+"나노 편집기는 UW 피코 텍스트 편집기 기능과 용이성을 흉내내도록 설계했습니"
+"다.  편집기에 네가지 주 섹션이 있습니다.  최상단에는 프로그램 버전과 현재 편"
+"집 중인 파일 이름, 파일을 수정했는지 여부를 나타냅니다.  다음은 현재 편집중"
+"인 파일의 내용을 나타내는 주 편집기 창입니다.  상태 표시줄은 바닥으로 부터 세"
+"번째 행이며 중요한 메시지를 나타냅니다.  "
+
+#: src/help.c:439
+msgid ""
+"The bottom two lines show the most commonly used shortcuts in the editor.\n"
+"\n"
+" Shortcuts are written as follows: Control-key sequences are notated with a "
+"'^' and can be entered either by using the Ctrl key or pressing the Esc key "
+"twice.  Meta-key sequences are notated with 'M-' and can be entered using "
+"either the Alt, Cmd, or Esc key, depending on your keyboard setup.  "
+msgstr ""
+"아래 두 줄은 편집기에서 주로 사용하는 바로 가기 키를 보여줍니다.\n"
+"\n"
+"바로 가기 키는 다음과 같이 작성했습니다: Control 키 입력 순서는 '^'로 나타내"
+"며 Ctrl 키를 한번 누르거나 Esc 키를 두번 누르는 식으로 입력할 수 있습니다.  "
+"Meta 키는 'M-'으로 표기하며, 키보드 설정에 따라 Alt, Cmd, Esc 키로 입력할 수 "
+"있습니다.  "
+
+#: src/help.c:446
+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 키를 두번 누르고 세자리 10진수를 입력하면 해당 값에 대응하는 문자가 "
+"들어갑니다.  주 편집기 창에서 다음 키 입력을 쑬 수 있습니다. 대안 키 입력은 "
+"괄호안에 표시했습니다:\n"
+"\n"
+
+#: src/help.c:478 src/help.c:551
+msgid "enable/disable"
+msgstr "기능 켬/기능 끔"
+
+#: src/history.c:240
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"계속하려면 Enter를 누르십시오\n"
+
+#: src/history.c:283
+#, 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/history.c:290
+#, 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/history.c:380 src/history.c:389 src/history.c:471 src/history.c:493
+#, c-format
+msgid "Error writing %s: %s\n"
+msgstr "%s 기록 오류: %s\n"
+
+#: src/nano.c:533
+msgid "Key is invalid in view mode"
+msgstr "뷰 모드에서 키 사용이 올바르지 않습니다"
+
+#: src/nano.c:539
+msgid "This function is disabled in restricted mode"
+msgstr "이 기능은 제한 모드에서 사용할 수 없습니다"
+
+#: src/nano.c:547
+msgid "Help is not available"
+msgstr "도움말이 없습니다"
+
+#: src/nano.c:650
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"%s에 버퍼 기록함\n"
+
+#: src/nano.c:652
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"%s에 버퍼 기록하지 않음: %s\n"
+
+#: src/nano.c:655
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"버퍼 기록하지 않음: %s\n"
+
+#: src/nano.c:764
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
+"\n"
+msgstr ""
+"사용법: nano [<옵션>] [[+<행>[,<열>]] <파일>]...\n"
+"\n"
+
+#. TRANSLATORS: The next two strings are part of the --help output.
+#. * It's best to keep its lines within 80 characters.
+#: src/nano.c:767
+#, c-format
+msgid ""
+"To place the cursor on a specific line of a file, put the line number with\n"
+"a '+' before the filename.  The column number can be added after a comma.\n"
+msgstr ""
+"파일의 특정 행에 커서를 두려면, 파일 이름 앞에 '+'를 붙인 행 번호를 지정해두"
+"십시오.\n"
+"컬럼 번호는 쉼표입력후 추가할 수 있습니다.\n"
+
+#: src/nano.c:769
+#, c-format
+msgid ""
+"When a filename is '-', nano reads data from standard input.\n"
+"\n"
+msgstr ""
+"파일 이름을 '-'으로 입력하면, 나노에서는 표준 입력에서 데이터를 가져옵니다.\n"
+"\n"
+
+#: src/nano.c:770
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "옵션\t\tGNU 긴 옵션\t\t의미\n"
+
+#. 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:774
+msgid "Enable smart home key"
+msgstr "똑똑한 Home 키 기능을 씁니다"
+
+#: src/nano.c:776
+msgid "Save backups of existing files"
+msgstr "기존 파일 백업을 저장합니다"
+
+#: src/nano.c:777
+msgid "-C <dir>"
+msgstr "-C <디렉터리>"
+
+#: src/nano.c:777
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<디렉터리>"
+
+#: src/nano.c:778
+msgid "Directory for saving unique backup files"
+msgstr "유일한 백업 파일을 저장할 디렉터리를 지정합니다"
+
+#: src/nano.c:781
+msgid "Use bold instead of reverse video text"
+msgstr "역순 비디오 텍스트 대신 굵은 텍스트를 씁니다"
+
+#: src/nano.c:783
+msgid "Convert typed tabs to spaces"
+msgstr "입력한 탭 문자를 공백문자로 바꿉니다"
+
+#: src/nano.c:788
+msgid "Read a file into a new buffer by default"
+msgstr "파일을 기본 새 버퍼로 읽어들입니다"
+
+#: src/nano.c:791
+msgid "Use (vim-style) lock files"
+msgstr "(vim 방식) 잠금 파일을 사용합니다"
+
+#: src/nano.c:796
+msgid "Log & read search/replace string history"
+msgstr "검색/바꾸기 문자열 기록을 기록하고 읽어옵니다"
+
+#: src/nano.c:799
+msgid "Don't look at nanorc files"
+msgstr "nanorc 파일을 찾아보지 않습니다"
+
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "이 컬럼에 유도 막대를 표시합니다"
+
+#: src/nano.c:806
+msgid "Fix numeric keypad key confusion problem"
+msgstr "숫자 키 패드 키 혼동 문제를 해결합니다"
+
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "개행 문자를 자동으로 추가하지 않습니다 [기본 설정]"
+
+#: src/nano.c:813
+msgid "Trim tail spaces when hard-wrapping"
+msgstr "강제 개행시 줄 뒤의 공백 문자를 제거합니다"
+
+#: src/nano.c:817
+msgid "Don't convert files from DOS/Mac format"
+msgstr "도스/맥 형식의 파일을 변환하지 않습니다"
+
+#: src/nano.c:822
+msgid "Log & read location of cursor position"
+msgstr "커서 위치를 기록하고 읽어들입니다"
+
+#: src/nano.c:825
+msgid "-Q <regex>"
+msgstr "-Q <정규표현식>"
+
+#: src/nano.c:825
+msgid "--quotestr=<regex>"
+msgstr "--quotestr=<정규표현식>"
+
+#: src/nano.c:826
+msgid "Regular expression to match quoting"
+msgstr "검색에 일치할 정규 표현식을 따옴표로 둘러쌉니다"
+
+#: src/nano.c:829
+msgid "Restricted mode"
+msgstr "제한 모드"
+
+#: src/nano.c:830
+msgid "-T <#cols>"
+msgstr "-T <컬럼 수>"
+
+#: src/nano.c:830
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<컬럼 수>"
+
+#: src/nano.c:831
+msgid "Set width of a tab to #cols columns"
+msgstr "<컬럼 수> 만큼 컬럼의 탭 길이를 설정합니다"
+
+#: src/nano.c:832
+msgid "Do quick statusbar blanking"
+msgstr "상태 표시줄을 빨리 비웁니다"
+
+#: src/nano.c:833
+msgid "Print version information and exit"
+msgstr "버전 정보를 출력하고 빠져나갑니다"
+
+#: src/nano.c:836
+msgid "Detect word boundaries more accurately"
+msgstr "단어 구분을 더 정확하게 합니다"
+
+#: src/nano.c:837
+msgid "-X <str>"
+msgstr "-X <문자열>"
+
+#: src/nano.c:837
+msgid "--wordchars=<str>"
+msgstr "--wordchars=<문자열>"
+
+#: src/nano.c:838
+msgid "Which other characters are word parts"
+msgstr "단어가 아닌 부분의 문자를 지정합니다"
+
+#: src/nano.c:842
+msgid "-Y <name>"
+msgstr "-Y <이름>"
+
+#: src/nano.c:842
+msgid "--syntax=<name>"
+msgstr "--syntax=<이름>"
+
+#: src/nano.c:843
+msgid "Syntax definition to use for coloring"
+msgstr "색으로 문법 강조할 문법을 정의합니다"
+
+#: src/nano.c:846
+msgid "Let Bsp and Del erase a marked region"
+msgstr "Backspace와 Delete키로 선택 영역 삭제 가능"
+
+#: src/nano.c:847
+msgid "When soft-wrapping, do it at whitespace"
+msgstr "공백 기준으로 줄을 나눕니다"
+
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "줄 길이를 넘어가는 줄 강제 개행"
+
+#: src/nano.c:852
+msgid "Constantly show cursor position"
+msgstr "항상 커서 위치를 보여줍니다"
+
+#: src/nano.c:854
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "Backspace/Delete 혼동 문제를 해결합니다"
+
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "제목 줄 아래는 비워둔 채로 유지합니다"
+
+#: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "텍스트가 개행 문자로 끝나는지 확인합니다"
+
+#: src/nano.c:859
+msgid "Show cursor in file browser & help text"
+msgstr "파일 브라우저와 도움말 텍스트에 커서를 나타냅니다"
+
+#: src/nano.c:861
+msgid "Show this help text and exit"
+msgstr "이 도움말 텍스트를 나타내고 빠져나갑니다"
+
+#: src/nano.c:863
+msgid "Automatically indent new lines"
+msgstr "새 줄에서 자동으로 들여쓰기"
+
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "줄 단위가 아닌 화면 높이 반 단위로 스크롤 이동"
+
+#: src/nano.c:867
+msgid "Cut from cursor to end of line"
+msgstr "커서로부터 줄 마지막 까지 자르기"
+
+#: src/nano.c:870
+msgid "Show line numbers in front of the text"
+msgstr "텍스트 앞에 줄 번호를 표시합니다"
+
+#: src/nano.c:873
+msgid "Enable the use of the mouse"
+msgstr "마우스 사용 기능을 켭니다"
+
+#: src/nano.c:875
+msgid "Do not read the file (only write it)"
+msgstr "파일을 읽지 않습니다(쓰기 전용)"
+
+#: src/nano.c:877
+msgid "-o <dir>"
+msgstr "-o <디렉터리>"
+
+#: src/nano.c:877
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<디렉터리>"
+
+#: src/nano.c:878
+msgid "Set operating directory"
+msgstr "처리 디렉터리 위치를 설정합니다"
+
+#: src/nano.c:880
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "XON (^Q) 키와 XOFF (^S) 키 사용 보류"
+
+#: src/nano.c:882
+msgid "-r <#cols>"
+msgstr "-r <컬럼 수>"
+
+#: src/nano.c:882
+msgid "--fill=<#cols>"
+msgstr "--fill=<컬럼 수>"
+
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "강제 개행 및 정렬시의 폭을 설정합니다"
+
+#: src/nano.c:887
+msgid "-s <prog>"
+msgstr "-s <프로그램>"
+
+#: src/nano.c:887
+msgid "--speller=<prog>"
+msgstr "--speller=<프로그램>"
+
+#: src/nano.c:888
+msgid "Enable alternate speller"
+msgstr "대안 철자 목록 기능을 켭니다"
+
+#: src/nano.c:890
+msgid "Auto save on exit, don't prompt"
+msgstr "빠져나갈 때 묻지 않고 자동 저장"
+
+#: src/nano.c:892
+msgid "Save a file by default in Unix format"
+msgstr "유닉스 형식을 기본으로 파일 저장"
+
+#: src/nano.c:894
+msgid "View mode (read-only)"
+msgstr "보기 모드(읽기 전용)"
+
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "긴 줄 강제 개행 하지 않음 [기본 설정]"
+
+#: src/nano.c:898
+msgid "Don't show the two help lines"
+msgstr "도움말 두 줄 표시하지 않음"
+
+#: src/nano.c:900
+msgid "Make Ctrl+Right stop at word ends"
+msgstr "Ctrl+Right 입력시 단어 마지막에 멈춤"
+
+#: src/nano.c:903
+msgid "Enable suspension"
+msgstr "잠시 멈춤 기능을 사용합니다"
+
+#: src/nano.c:905
+msgid "Enable soft line wrapping"
+msgstr "줄 나누기 기능을 사용합니다"
+
+#: src/nano.c:917
+#, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU 나노. 버전 %s\n"
+
+#: src/nano.c:920
+#, c-format
+msgid " (C) 2014-%s the contributors to nano\n"
+msgstr " (C) 2014-%s the contributors to nano\n"
+
+#: src/nano.c:921
+#, c-format
+msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
+msgstr ""
+" 전자메일 주소: nano@nano-editor.org\t웹 사이트: https://nano-editor.org/"
+
+#: src/nano.c:922
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+"컴파일한 옵션:"
+
+#: src/nano.c:1065
+msgid "No file name"
+msgstr "파일 이름이 없습니다"
+
+#: src/nano.c:1067
+msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
+msgstr ""
+"수정한 버퍼를 저장하시겠습니까?  (바꾼 내용을 버리려면 \"No\"로 답하십시오.) "
+
+#: src/nano.c:1114
+#, c-format
+msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
+msgstr "표준 입력을 읽고 있습니다. 끝내려면 ^D 또는 ^D^D를 입력하십시오.\n"
+
+#: src/nano.c:1141
+#, c-format
+msgid "Failed to open stdin: %s"
+msgstr "표준 입력 열기 실패: %s"
+
+#: src/nano.c:1154
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "키보드 표준 입력을 다시 열 수 없습니다, 미안합니다\n"
+
+#: src/nano.c:1235
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "SIGHUP 또는 SIGTERM 시그널을 받았습니다\n"
+
+#: src/nano.c:1242
+#, c-format
+msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
+msgstr ""
+"아이고! 미안합니다! 나노가 깨져버렸네요! 코드: %d.  버그를 알려주세요.\n"
+
+#: src/nano.c:1258
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "나노로 돌아가려면 \"fg\"를 사용하십시오.\n"
+
+#: src/nano.c:1279
+msgid "Suspension is not enabled"
+msgstr "잠시 멈춤 기능을 활성화하지 않았습니다"
+
+#: src/nano.c:1411
+msgid "enabled"
+msgstr "기능 켬"
+
+#: src/nano.c:1411
+msgid "disabled"
+msgstr "기능 끔"
+
+#: src/nano.c:1568
+msgid "Unbound key"
+msgstr "연결하지 않은 키 입력"
+
+#: src/nano.c:1571
+msgid "Unbindable key: M-["
+msgstr "연결할 수 없는 키 입력: M-["
+
+#: src/nano.c:1573
+#, c-format
+msgid "Unbound key: M-%c"
+msgstr "연결하지 않은 키 입력: M-%c"
+
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "연결할 수 없는 키 입력: ^["
+
+#: src/nano.c:1577
+#, c-format
+msgid "Unbound key: ^%c"
+msgstr "연결하지 않은 키 입력: ^%c"
+
+#: src/nano.c:1579
+#, c-format
+msgid "Unbound key: %c"
+msgstr "연결하지 않은 키 입력: %c"
+
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "유도 컬럼 \"%s\"은(는) 올바르지 않습니다"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "%s 옵션을 무시합니다. 기본값입니다\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "요청한 \"%s\" 탭 간격 길이가 올바르지 않습니다"
+
+#: src/nano.c:2284 src/rcfile.c:1115
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "요청한 \"%s\" 채우기 용량이 올바르지 않습니다"
+
+#: src/nano.c:2331
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "가용 옵션 목록을 보려면 '%s -h'를 입력하십시오.\n"
+
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "불량한 \"%s\" 정규표현식 인용: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
+msgid "Invalid line or column number"
+msgstr "잘못된 행, 열 번호"
+
+#: src/nano.c:2703
+#, c-format
+msgid "Mistakes in '%s'"
+msgstr "'%s'에 잘못된 설정"
+
+#: src/nano.c:2709
+msgid "Welcome to nano.  For basic help, type Ctrl+G."
+msgstr "나노 사용을 환영합니다!  기본 도움말을 보려면 Ctrl+G키를 누르십시오."
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#. TRANSLATORS: For the next three strings, specify the starting letters
+#. * of the translations for "Yes"/"No"/"All".  The first letter of each of
+#. * these strings MUST be a single-byte letter; others may be multi-byte.
+#: src/prompt.c:656
+msgid "Yy"
+msgstr "Yy"
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#: src/prompt.c:657
+msgid "Nn"
+msgstr "Nn"
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#: src/prompt.c:658
+msgid "Aa"
+msgstr "Aa"
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#: src/prompt.c:682
+msgid "Yes"
+msgstr "Yes"
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#: src/prompt.c:686
+msgid "No"
+msgstr "No"
+
+# NOTE: DO NOT TRANSLATE!! This is for giving hint of user input. Y/N/A or Yes/No/All
+#: src/prompt.c:691
+msgid "All"
+msgstr "All"
+
+#: src/rcfile.c:157
+#, c-format
+msgid "Error in %s on line %zu: "
+msgstr "%s의 %zu번째 행 오류: "
+
+#: src/rcfile.c:208
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "'%s' 인자 값이 \" 문자로 끝나지 않았습니다"
+
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
+msgid "Regex strings must begin and end with a \" character"
+msgstr "정규표현식 문자열은 \" 문자로 시작하고 끝나야 합니다"
+
+#: src/rcfile.c:258 src/search.c:47
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "잘못된 정규 표현식 \"%s\": %s"
+
+#: src/rcfile.c:277
+msgid "Missing syntax name"
+msgstr "문법 이름 빠짐"
+
+#: src/rcfile.c:285
+msgid "Unpaired quote in syntax name"
+msgstr "문법 이름에 짝이 맞지 않는 따옴표"
+
+#: src/rcfile.c:297
+msgid "The \"none\" syntax is reserved"
+msgstr "\"none\" 문법은 예약입니다"
+
+#: src/rcfile.c:323
+msgid "The \"default\" syntax does not accept extensions"
+msgstr "\"default\" 문법은 확장에서 받아들일 수 없습니다"
+
+#: src/rcfile.c:355
+msgid "Missing key name"
+msgstr "키 이름 빠짐"
+
+#: src/rcfile.c:364 src/rcfile.c:375
+msgid "Key name is too short"
+msgstr "키 이름이 너무 짧습니다"
+
+#: src/rcfile.c:385
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "키 이름은 \"^\", \"M\", \"F\"로 시작해야 합니다"
+
+#: src/rcfile.c:388
+#, c-format
+msgid "Key name %s is invalid"
+msgstr "%s 키 이름이 올바르지 않습니다"
+
+#: src/rcfile.c:397
+msgid "Must specify a function to bind the key to"
+msgstr "키를 연결할 기능을 지정하십시오"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:408
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "키에 연결/연결 취소할 메뉴(또는 \"all\")를 지정하십시오"
+
+#: src/rcfile.c:426
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "\"%s\" 이름을 기능에 대응할 수 없습니다"
+
+#: src/rcfile.c:433
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "\"%s\" 이름을 메뉴에 대응할 수 없습니다"
+
+#: src/rcfile.c:466
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "'%s' 기능은 '%s' 메뉴에 없습니다"
+
+#: src/rcfile.c:477
+#, c-format
+msgid "Keystroke %s may not be rebound"
+msgstr "%s 키 입력을 다시 연결할 수 없습니다"
+
+#: src/rcfile.c:567
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "%s 확장 오류: %s"
+
+#: src/rcfile.c:607
+#, c-format
+msgid "Color \"%s\" not understood"
+msgstr "\"%s\" 색상을 이해할 수 없습니다"
+
+#: src/rcfile.c:623
+msgid "A background color cannot be bright"
+msgstr "배경색은 밝을 수 없습니다"
+
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
+#, c-format
+msgid "A '%s' command requires a preceding 'syntax' command"
+msgstr "'%s' 명령 이전에 'syntax' 명령이 필요합니다"
+
+#: src/rcfile.c:661
+msgid "Missing color name"
+msgstr "색 이름 빠짐"
+
+#: src/rcfile.c:671 src/rcfile.c:807
+#, c-format
+msgid "Missing regex string after '%s' command"
+msgstr "'%s' 명령 다음 정규 표현식 문자열이 빠짐"
+
+#: src/rcfile.c:702 src/rcfile.c:753
+msgid "Empty regex string"
+msgstr "정규 표현식 문자열이 비어있음"
+
+#: src/rcfile.c:737
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"end=\"에 해당하는 \"start=\"가 필요합니다"
+
+#: src/rcfile.c:802
+#, c-format
+msgid "The \"default\" syntax does not accept '%s' regexes"
+msgstr "\"기본\" 문법은 '%s' 정규 표현식을 허용하지 않습니다"
+
+#: src/rcfile.c:860
+#, c-format
+msgid "Missing argument after '%s'"
+msgstr "'%s' 다음 인자가 빠졌습니다"
+
+#: src/rcfile.c:870
+#, c-format
+msgid "Argument of '%s' lacks closing \""
+msgstr "'%s' 인자에 \" 닫기 부분이 빠졌습니다"
+
+#: src/rcfile.c:898
+#, c-format
+msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
+msgstr "'%2$s' 메뉴의 '%1$s' 기능에 연결한 키가 없습니다.  빠져나감.\n"
+
+#: src/rcfile.c:901 src/rcfile.c:1261
+#, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "필요할 경우 nanorc 설정을 바꾸려면 -l 옵션을 사용하십시오.\n"
+
+#: src/rcfile.c:955
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "확장할 \"%s\" 문법을 찾을 수 없습니다"
+
+#: src/rcfile.c:977 src/rcfile.c:1189
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "\"%s\" 문법에 색 명령이 없습니다"
+
+#: src/rcfile.c:1007
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "포함 파일에서 \"%s\" 명령을 허용하지 않습니다"
+
+#: src/rcfile.c:1022
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "\"%s\" 명령을 이해할 수 없음"
+
+#: src/rcfile.c:1034
+msgid "Missing option"
+msgstr "옵션 빠짐"
+
+#: src/rcfile.c:1048
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "알 수 없는 \"%s\" 옵션"
+
+#: src/rcfile.c:1057
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "\"%s\" 옵션 설정을 취소할 수 없습니다"
+
+#: src/rcfile.c:1069
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "\"%s\" 옵션에 인자가 필요합니다"
+
+#: src/rcfile.c:1084
+msgid "Argument is not a valid multibyte string"
+msgstr "인자 값은 올바른 다중바이트 문자열이 아닙니다"
+
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
+msgid "Non-blank characters required"
+msgstr "비어있지 않은 문자가 필요합니다"
+
+#: src/rcfile.c:1138
+msgid "Two single-column characters required"
+msgstr "두 단일 컬럼 문자가 필요합니다"
+
+#: src/rcfile.c:1253
+msgid "I can't find my home directory!  Wah!"
+msgstr "내 기본 디렉터리가 없네요?! 이야~!"
+
+#. TRANSLATORS: The next four modify the search prompt.
+#: src/search.c:105
+msgid " [Case Sensitive]"
+msgstr "[대소문자 구분]"
+
+#: src/search.c:106
+msgid " [Regexp]"
+msgstr " [정규 표현식]"
+
+#: src/search.c:109
+msgid " (to replace) in selection"
+msgstr " 선택 영역에서(바꾸기 대상)"
+
+#: src/search.c:111
+msgid " (to replace)"
+msgstr " (바꾸기 대상)"
+
+#. TRANSLATORS: This is shown when searching takes
+#. * more than half a second.
+#: src/search.c:225
+msgid "Searching..."
+msgstr "검색 중..."
+
+#: src/search.c:394
+#, c-format
+msgid "\"%.*s%s\" not found"
+msgstr "\"%.*s%s\" 대상이 없습니다"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:587
+msgid "Replace this instance?"
+msgstr "한 번에 바꾸시겠습니까?"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:709
+msgid "Replace with"
+msgstr "바꿀 단어"
+
+#: src/search.c:740
+#, c-format
+msgid "Replaced %zd occurrence"
+msgid_plural "Replaced %zd occurrences"
+msgstr[0] "%zd번 바꾸었습니다"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:768
+msgid "Enter line number, column number"
+msgstr "행, 열 번호를 입력하십시오"
+
+#: src/search.c:957
+msgid "Not a bracket"
+msgstr "각 괄호 아님"
+
+#: src/search.c:1018
+msgid "No matching bracket"
+msgstr "일치하는 각 괄호 없음"
+
+#: src/text.c:57
+msgid "Mark Set"
+msgstr "설정 표시"
+
+#: src/text.c:61
+msgid "Mark Unset"
+msgstr "설정 취소 표시"
+
+#: src/text.c:71
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "\"%s\" 실행 오류"
+
+#: src/text.c:387
+msgid "Commenting is not supported for this file type"
+msgstr "이 파일 형식에서는 주석 처리를 지원하지 않습니다"
+
+#: src/text.c:397
+msgid "Cannot comment past end of file"
+msgstr "파일 마지막에는 주석을 달 수 없습니다"
+
+#: src/text.c:525
+msgid "Nothing in undo buffer!"
+msgstr "실행 취소 버퍼에 기록이 없습니다!"
+
+#. TRANSLATORS: The next thirteen strings describe actions
+#. * that are undone or redone.  They are all nouns, not verbs.
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "추가"
+
+#: src/text.c:555 src/text.c:735
+msgid "line break"
+msgstr "줄 바꿈"
+
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "삭제"
+
+#: src/text.c:577 src/text.c:761
+msgid "line join"
+msgstr "행 결합"
+
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "바꾸기"
+
+#: src/text.c:614 src/text.c:795
+msgid "erasure"
+msgstr "소거"
+
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "잘라내기"
+
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "붙여넣기"
+
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "삽입"
+
+#: src/text.c:655 src/text.c:826
+msgid "indent"
+msgstr "들여쓰기"
+
+#: src/text.c:659 src/text.c:830
+msgid "unindent"
+msgstr "내어쓰기"
+
+#: src/text.c:664 src/text.c:835
+msgid "comment"
+msgstr "주석 처리"
+
+#: src/text.c:668 src/text.c:839
+msgid "uncomment"
+msgstr "주석 처리 취소"
+
+#: src/text.c:677
+#, c-format
+msgid "Undid %s"
+msgstr "%s 실행 취소함"
+
+#: src/text.c:702
+msgid "Nothing to re-do!"
+msgstr "다시 실행할 작업이 없습니다!"
+
+#: src/text.c:848
+#, c-format
+msgid "Redid %s"
+msgstr "%s 다시 실행함"
+
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
+msgid "Could not create pipe"
+msgstr "파이프를 만들 수 없습니다"
+
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
+msgid "Could not fork"
+msgstr "포킹할 수 없습니다"
+
+#: src/text.c:1036 src/text.c:1088
+msgid "filtering"
+msgstr "필터링"
+
+#: src/text.c:1082
+#, c-format
+msgid "Failed to open pipe: %s"
+msgstr "파이프 열기 실패: %s"
+
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "정렬"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "선택 영역 정렬함"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "파일 정렬함"
+
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "문단 정렬함"
+
+#: src/text.c:2370
+#, c-format
+msgid "Unfindable word: %s"
+msgstr "찾을 수 없는 단어: %s"
+
+#: src/text.c:2386
+msgid "Edit a replacement"
+msgstr "바꿀 단어 편집"
+
+#. TRANSLATORS: Shown after fixing misspellings in one word.
+#: src/text.c:2399
+msgid "Next word..."
+msgstr "다음 단어..."
+
+#: src/text.c:2450
+msgid "Creating misspelled word list, please wait..."
+msgstr "잘못된 철자 단어 목록을 만드는 중입니다, 잠시 기다리십시오..."
+
+#: src/text.c:2543 src/text.c:2866
+msgid "Could not get size of pipe buffer"
+msgstr "파이프 버퍼 크기를 가져올 수 없습니다"
+
+#: src/text.c:2597
+msgid "Error invoking \"spell\""
+msgstr "\"spell\" 실행 오류"
+
+#: src/text.c:2600
+msgid "Error invoking \"sort -f\""
+msgstr "\"sort -f\" 실행 오류"
+
+#: src/text.c:2603
+msgid "Error invoking \"uniq\""
+msgstr "\"uniq\" 실행 오류"
+
+#: src/text.c:2771
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "철자 검사 실패: %s"
+
+#: src/text.c:2773
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "철자 검사 실패: %s: %s"
+
+#: src/text.c:2776
+msgid "Finished checking spelling"
+msgstr "철자 검사가 끝났습니다"
+
+#: src/text.c:2801
+msgid "No linter defined for this type of file!"
+msgstr "이 파일 형식에 맞는 분석 도구를 정의하지 않았습니다!"
+
+#: src/text.c:2811
+msgid "Save modified buffer before linting?"
+msgstr "분석 도구 실행 전 수정한 버퍼 내용을 저장하시겠습니까?"
+
+#: src/text.c:2828
+msgid "Invoking linter, please wait"
+msgstr "분석 도구 실행중입니다. 잠시 기다리십시오"
+
+#: src/text.c:2960
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "명령에서 해석 가능한 줄이 없습니다: %s"
+
+#: src/text.c:2998
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"이 메시지는 열지 않은 %s 파일에서 나왔습니다. 새 버퍼에서 여시겠습니까?"
+
+#: src/text.c:3037
+msgid "No messages for this file"
+msgstr "이 파일에 대한 메시지 없음"
+
+#: src/text.c:3084
+msgid "At first message"
+msgstr "처음 메시지"
+
+#: src/text.c:3093
+msgid "At last message"
+msgstr "마지막 메시지"
+
+#: src/text.c:3179
+#, c-format
+msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
+msgstr "%s단어: %zu  행: %zd번째  문자: %zu"
+
+#: src/text.c:3180
+msgid "In Selection:  "
+msgstr "선택:"
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3193
+msgid "Verbatim Input"
+msgstr "입력 그대로"
+
+#: src/text.c:3290
+msgid "No word fragment"
+msgstr "단어로 분할하지 않음"
+
+#: src/text.c:3382
+msgid "No further matches"
+msgstr "더 이상 일치하는 항목 없음"
+
+#. TRANSLATORS: Shown when there are zero possible completions.
+#: src/text.c:3386
+msgid "No matches"
+msgstr "일치하는 항목 없음"
+
+#: src/utils.c:315 src/utils.c:327
+msgid "Nano is out of memory!\n"
+msgstr "나노에서 사용할 메모리가 부족합니다!\n"
+
+#: src/winio.c:86
+msgid "Recording a macro..."
+msgstr "매크로 기록 중..."
+
+#: src/winio.c:89
+msgid "Stopped recording"
+msgstr "기록 멈춤"
+
+#: src/winio.c:100
+msgid "Cannot run macro while recording"
+msgstr "기록 중에는 매크로를 실행할 수 없습니다"
+
+#: src/winio.c:106
+msgid "Macro is empty"
+msgstr "매크로 내용이 없습니다"
+
+#: src/winio.c:207
+msgid "Too many errors from stdin\n"
+msgstr "표준 입력에 오류가 너무 많습니다\n"
+
+#. TRANSLATORS: This refers to a sequence of escape codes
+#. * (from the keyboard) that nano does not recognize.
+#: src/winio.c:1352
+msgid "Unknown sequence"
+msgstr "알 수 없는 이스케이프 코드 시퀀스"
+
+#. TRANSLATORS: This is shown while a six-digit hexadecimal
+#. * Unicode character code (%s) is being typed in.
+#: src/winio.c:1491
+#, c-format
+msgid "Unicode Input: %s"
+msgstr "유니코드 입력: %s"
+
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
+msgid "Linting --"
+msgstr "분석 중 --"
+
+#: src/winio.c:2075
+msgid "DIR:"
+msgstr "디렉터리:"
+
+#: src/winio.c:2096 src/winio.c:2102
+msgid "Modified"
+msgstr "수정함"
+
+#: src/winio.c:2098
+msgid "View"
+msgstr "보기"
+
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "제한"
+
+#: src/winio.c:2229
+msgid "Further warnings were suppressed"
+msgstr "더 이상 경고를 나타내지 않습니다"
+
+#: src/winio.c:3431
+#, c-format
+msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
+msgstr ""
+"%zd행/전체 %zd행 (%d%%), %zu열/전체 %zu열 (%d%%), %zu번째 문자/전체 문자 %zu"
+"개 (%d%%)"
+
+#: src/winio.c:3623
+msgid "The nano text editor"
+msgstr "나노 텍스트 편집기"
+
+#: src/winio.c:3624
+msgid "version"
+msgstr "버전"
+
+#: src/winio.c:3625
+msgid "Brought to you by:"
+msgstr "제공자:"
+
+#: src/winio.c:3626
+msgid "Special thanks to:"
+msgstr "특히 감사드릴 분들:"
+
+#: src/winio.c:3627
+msgid "The Free Software Foundation"
+msgstr "자유 소프트웨어 재단"
+
+#: src/winio.c:3628
+msgid "the many translators and the TP"
+msgstr "다수 번역자와 TranslationProject"
+
+#: src/winio.c:3629
+msgid "For ncurses:"
+msgstr "ncurses:"
+
+#: src/winio.c:3630
+msgid "and anyone else we forgot..."
+msgstr "그리고 우리가 잊은 다른 분들..."
+
+#: src/winio.c:3631
+msgid "Thank you for using nano!"
+msgstr "나노를 사용해주셔서 감사합니다!"
diff --git a/po/ms.po b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.9.8-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-08-21 21:09+1000\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -29,9 +29,9 @@ msgstr "tak dapat membuka direktori %s"
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -46,9 +46,9 @@ msgstr "Tidak dapat menulis diluar daripada %s"
 msgid "Can't move up a directory"
 msgstr "Tidak dapat pindah naik direktori"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
@@ -95,17 +95,17 @@ msgstr "Hanya inilah sahaja yang dijumpai"
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nama sintaks tiada"
 
-#: src/color.c:238
+#: src/color.c:240
 #, fuzzy, c-format
 msgid "magic_load() failed: %s"
 msgstr "[%s (%s): gagal.  Diabaikan]\n"
 
-#: src/color.c:242
+#: src/color.c:244
 #, fuzzy, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "%s: fail `%s' mempunyai cecikut magik buruk\n"
@@ -200,7 +200,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
@@ -301,854 +301,850 @@ msgstr "dari %s"
 msgid "File to insert [from %s]"
 msgstr "dari %s"
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Tetapkan direktori operasi"
 
-#: src/files.c:1521
+#: src/files.c:1517
 #, fuzzy
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Gagal menulis fail sandaran, terus menyimpan? (Katakanlah N jika tidak pasti)"
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Direktori untuk menyimpan fail salinan unik"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis diluar daripada %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Terlalu banyak fail salinan?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "setiap baris"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Salinan]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Tambahan Awalan Pilihan ke Fail"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Tambahan Akhiran Pilihan ke Fail"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Tulis Pilihan ke Fail"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nama Fail untuk di Tambah Awalan"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nama Fail untuk di Tambah Akhiran"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nama Fail untuk di Tulis"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 #, fuzzy
 msgid "File exists -- cannot overwrite"
 msgstr "%s: tak dapat menindih direktori"
 
-#: src/files.c:2254
+#: src/files.c:2249
 #, fuzzy
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "enggan untuk menulisganti fail masukan %s"
 
-#: src/files.c:2289
+#: src/files.c:2283
 #, fuzzy
 msgid "File on disk has changed"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/files.c:2291
+#: src/files.c:2285
 #, fuzzy
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Fail telah diubahsuai semenjak anda membukanya, teruskan menyimpan ?"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(lagi)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Tutup"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "nyahpotong teks"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-msgstr "Sekarang boleh UnJustify!"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Masukkan fail lain ke file semasa"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/global.c:553
+#: src/global.c:547
 #, fuzzy
 msgid "Refresh the file list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:555
+#: src/global.c:549
 #, fuzzy
 msgid "Go to lefthand column"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:556
+#: src/global.c:550
 #, fuzzy
 msgid "Go to righthand column"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:561
+#: src/global.c:555
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:562
+#: src/global.c:556
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Potong baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Kembalikan dari cutbuffer ke baris semasa"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Papar posisi kursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Tanda teks pada lokasi kursor"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Salin baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Inden baris semasa"
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Inden baris semasa"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Nyahindent baris semasa"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Buat semula tindakan nyahbuat terakhir"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Undur belakang satu perkataan"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Pergi ke baris terdahulu"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Pergi ke permulaan baris semasa"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Pergi ke penghujung baris semasa"
 
-#: src/global.c:591
+#: src/global.c:585
 #, fuzzy
 msgid "Go to previous block of text"
 msgstr "Ke Teks"
 
-#: src/global.c:592
+#: src/global.c:586
 #, fuzzy
 msgid "Go to next block of text"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Pergi ke baris pertama fail"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Pergi ke baris terakhir fail"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Pergi ke braket sepadan"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Skrol atas satu baris tanpa skrol kursor"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Skrol bawah satu baris tanpa skrol kursor"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Tukar ke buffer fail terdahulu"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Tukar ke buffer fail berikut"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Masukkan baris baru di kedudukan kursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Padam aksara dibawah kursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Padam aksara di kiri kursor"
 
-#: src/global.c:622
+#: src/global.c:616
 #, fuzzy
-msgid "Cut backward from cursor to word start"
+msgid "Delete backward from cursor to word start"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/global.c:624
+#: src/global.c:618
 #, fuzzy
-msgid "Cut forward from cursor to next word start"
+msgid "Delete forward from cursor to next word start"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Potong dari kedudukan kursor hingga ke akhir fail"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justifikasi perenggan semasa"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justifi keseluruhan fail"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Kira jumlah perkataan, baris, dan aksara"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Segarkan (lukis semula) skrin semasa"
 
-#: src/global.c:639
+#: src/global.c:633
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Gantung penyunting (jika gantung dihidupkan)"
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Inden baris semasa"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:649
+#: src/global.c:643
 #, fuzzy
 msgid "Search next occurrence forward"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 #, fuzzy
 msgid "Run the last recorded macro"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Toggle pencarian case sensitif"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Terbalikkan arah carian"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Toggle penggunaan ungkapan nalar"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Panggil semula rentetan cari/ganti terdahulu"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Toggle penggunaan format DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Toggle penggunaan format Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Toggle tambahan akhiran"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Toggle tambahan awalan"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Toggle salinan fail asal"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Laksanakan arahan luaran"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Jangan tukar fail dari format DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Toggle kegunaan buffer baru"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Pergi ke pelayar fail"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Keluar dari pelayar fail"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:686
+#: src/global.c:680
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:687
+#: src/global.c:681
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Pergi ke direktori"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:693
+#: src/global.c:687
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Pergi ke baris berikutnya"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Bantuan"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "ralat menulis"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Baca Fail"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justifikasi"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ganti"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Pergi Ke Dir"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Kerat Teks"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "(paip)"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ke Pengeja"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ke Baris"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Nyahbuat"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Buat semula"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Case Sens"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Kebelakang"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Jangan Ganti"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "JustifiPenuh"
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Bukan kurungan"
 
-#: src/global.c:841 src/global.c:1000
-#, fuzzy
-msgid "Save"
-msgstr "Auto simpan ketika keluar, jangan maklum"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Di mana"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "pengisytiharan terdahulu untuk %s"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr " (periksa selepas lekapan akan datang)"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Maju"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Perkataan Selepas"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Baris Berikut"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Baris Berikut"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Minta untuk Par"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Pengakhir Par"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Terdahulu"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Berikut"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Brs Awal"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Brs Akhir"
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fail Selepas"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Padam"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
 #, fuzzy
-msgid "Cut Left"
+msgid "Chop Left"
 msgstr " pada kiri:"
 
-#: src/global.c:947
+#: src/global.c:950
 #, fuzzy
-msgid "Cut Right"
+msgid "Chop Right"
 msgstr " pada kanan:"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:963
+#: src/global.c:966
 #, fuzzy
 msgid "Verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Gantung"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Indent baris baru secara automatik"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "KOMEN"
 
-#: src/global.c:983
+#: src/global.c:988
 #, fuzzy
 msgid "Complete"
 msgstr "Untuk dokumentasi lengkap, laksanakan: info bison.\n"
 
-#: src/global.c:987
+#: src/global.c:992
 #, fuzzy
 msgid "Record"
 msgstr "\t%d rekod histogram\n"
 
-#: src/global.c:989
+#: src/global.c:994
 #, fuzzy
 msgid "Run Macro"
 msgstr "ketika cuba untuk melaksana '%s'"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "Ke Baris"
 
+#: src/global.c:1006
+#, fuzzy
+msgid "Save"
+msgstr "Auto simpan ketika keluar, jangan maklum"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ke Teks"
@@ -1235,61 +1231,62 @@ msgstr "\t\tSeterusnya pada: %s\n"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Gulungan lancar"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Gulung mengikut baris berbanding separuh skrin"
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1416
+#: src/global.c:1426
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/global.c:1424
+#: src/global.c:1434
 #, fuzzy
 msgid "Line numbering"
 msgstr "BARIS"
@@ -1656,22 +1653,22 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Ralat menulis %s: %s"
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Mod lihat (baca sahaja)"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Mod terhad"
 
-#: src/nano.c:551
+#: src/nano.c:547
 #, fuzzy
 msgid "Help is not available"
 msgstr "Bantuan"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1680,7 +1677,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1689,7 +1686,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis ke %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1698,7 +1695,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1709,308 +1706,321 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Pilihan\t\tPilihan panjang GNU\t\tMaksud\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Aktifkan kekunci home pintar"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Simpan salinan fail sediawujud"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Direktori untuk menyimpan fail salinan unik"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Guna tebal berbanding teks video terbalik"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Tukar tab ditaip kepada ruang"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat pada fail nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Pergi ke nombor baris dan lajur"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Betulkan masalah kekeliruan pad kekunci bernombor"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Jangan tambah baris baru pada penghujung fail"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan tukar fail dari format DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Guna satu lagi baris untuk menyunting"
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 #, fuzzy
 msgid "Regular expression to match quoting"
 msgstr "Regular expression tamat tiba-tiba"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mod terhad"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Gulung mengikut baris berbanding separuh skrin"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Tetapkan lebar tab dalam ke #lajur lajur"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Laksana pengosongan bar status pantas"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Papar maklumat versi dan keluar"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Kesan sempadan perkataan lebih tepat"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "-X <str>"
 msgstr "\t\tX: "
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "--wordchars=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "-Y <name>"
 msgstr "\t\tY: "
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "Nama sintaks tiada"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Takrifan sintaks untuk digunakan bagi mewarna"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Jangan lilit baris panjang"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Sentiasa papar kedudukan kursor"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Betulkan masalah kekeliruan Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Sentiasa papar kedudukan kursor"
 
-#: src/nano.c:858
+#: src/nano.c:861
 #, fuzzy
 msgid "Show this help text and exit"
 msgstr "Jangan papar dua baris bantuan"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indent baris baru secara automatik"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan penggunaan tetikus"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Tetapkan direktori operasi"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Pelihara kekunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-#, fuzzy
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Tetapkan titik gulungan pada lajur #lajur"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Aktifkan pengeja lain"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto simpan ketika keluar, jangan maklum"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Mod lihat (baca sahaja)"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Jangan lilit baris panjang"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Jangan papar dua baris bantuan"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Aktifkan gantungan"
 
-#: src/nano.c:899
+#: src/nano.c:905
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr "bison (GNU Bison) %s"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Emel: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2019,228 +2029,248 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 #, fuzzy
 msgid "No file name"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, fuzzy, c-format
 msgid "Failed to open stdin: %s"
 msgstr "pembukaan gagal"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 #, fuzzy
 msgid "Suspension is not enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 #, fuzzy
 msgid "Unbound key"
 msgstr "\t\tPenggunaan Kekunci:\n"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 #, fuzzy
 msgid "Unbindable key: M-["
 msgstr "%b %e %H:%M"
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, fuzzy, c-format
 msgid "Unbound key: M-%c"
 msgstr "caret (i.e., `^C', `M-^C' dsb.)"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "%b %e %H:%M"
+
+#: src/nano.c:1577
 #, fuzzy, c-format
 msgid "Unbound key: ^%c"
 msgstr "\t\tPenggunaan Kekunci:\n"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, fuzzy, c-format
 msgid "Unbound key: %c"
 msgstr "\t\tPenggunaan Kekunci:\n"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Nama pengguna tidak sah: %s"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Regex tidak sah \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, fuzzy, c-format
 msgid "Mistakes in '%s'"
 msgstr "< %s ... %s > ? "
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Tidak"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Semua"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Ralat membaca %s: %s"
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaks \"none\" adalah dikhaskan"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 #, fuzzy
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 #, fuzzy
 msgid "Key name is too short"
 msgstr "%s: fail terlalu pendek untuk menjadi fail gmon\n"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 #, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ikatankekunci mesti bermula dengan \"^\", \"M\", atau \"F\"\n"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Nama pengguna tidak sah: %s"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 #, fuzzy
 msgid "Must specify a function to bind the key to"
 msgstr "Mesti menyatakan fungsi untuk mengikat kekunci ke\n"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Tidak dapat memetakan nama \"%s\" ke fungsi\n"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, fuzzy, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr "Maaf, kekunci \"%s\" adalah ikatan tidak sah\n"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr ""
@@ -2250,55 +2280,55 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, fuzzy, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 #, fuzzy
 msgid "Empty regex string"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, fuzzy, c-format
 msgid "Missing argument after '%s'"
 msgstr "hujah tiada bagi `%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "menutup fail output %s"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2306,60 +2336,60 @@ msgstr ""
 "Keluar. Sila guna nano dengan pilihan -I jika perlu untuk mengubah tetapan "
 "nanorc anda\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "hujah tiada bagi `%s'"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "pilihan pengguna tidak diketahui `%s'"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "%s: pilihan '--%s' tidak dikenali\n"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
@@ -2421,244 +2451,257 @@ msgstr "Bukan kurungan"
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Tetapkan Tanda"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Nyahtetap Tanda"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 #, fuzzy
 msgid "Commenting is not supported for this file type"
 msgstr "Jenis sijil tidak disokong."
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Tiada apa dalam buffer nyahbuat!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "tambah teks"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 #, fuzzy
 msgid "line break"
 msgstr "BARIS"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "padam teks"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Dalam Pilihan:"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "gabung baris"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "ganti teks"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Ubah penggantian"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "potong teks"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "nyahpotong teks"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "selit teks"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Indent baris baru secara automatik"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Teks Tidak Indent"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 #, fuzzy
 msgid "comment"
 msgstr "KOMEN"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Nyahbuat tindakan (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Tiada apa hendak di ulangbuat!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "tidak dapat membuka paip pada `%s'"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Petikan rentetan tidak sesuai %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Justifi keseluruhan fail"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Sekarang boleh UnJustify!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Justifikasi perenggan semasa"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, fuzzy, c-format
 msgid "Unfindable word: %s"
 msgstr "lokasi senarai perkataan utama"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Ubah penggantian"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "Perkataan Selepas"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Ralat melaksanakan \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Ralat melaksanakan \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:3037
+#: src/text.c:2801
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "%s mempunyai jenis fail yang tidak diketahui"
 
-#: src/text.c:3047
+#: src/text.c:2811
 #, fuzzy
 msgid "Save modified buffer before linting?"
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/text.c:3064
+#: src/text.c:2828
 #, fuzzy
 msgid "Invoking linter, please wait"
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 #, fuzzy
 msgid "At first message"
 msgstr "baris dahulu"
 
-#: src/text.c:3329
+#: src/text.c:3093
 #, fuzzy
 msgid "At last message"
 msgstr "terkahir="
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sPerkataan: %zu  Baris: %zd  Aksara: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Masukan Verbatim"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr ""
@@ -2668,7 +2711,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano tidak cukup memori!"
@@ -2697,76 +2740,81 @@ msgstr "Terlalu banyak ralat dari stdin"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Jujukan tidak diketahui"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, fuzzy, c-format
 msgid "Unicode Input: %s"
 msgstr "enggan untuk menulisganti fail masukan %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Lihat"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Mod terhad"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "baris %zd/%zd (%d%%), lajur %zu/%zu (%d%%), aksara %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "kesemua penterjemah dan TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Terima kasih kerana menggunakan nano!"
 
@@ -2776,9 +2824,22 @@ msgstr "Terima kasih kerana menggunakan nano!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Kekunci tidak sah dalam mod bukan multibuffer"
 
+#, fuzzy
+#~| msgid "UnCut Text"
+#~ msgid "Uncut Text"
+#~ msgstr "nyahpotong teks"
+
+#, fuzzy
+#~| msgid "UnJustify"
+#~ msgid "Unjustify"
+#~ msgstr "Sekarang boleh UnJustify!"
+
 #~ msgid "WhereIs Next"
 #~ msgstr "Dimana Seterusnya"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Kembalikan dari cutbuffer ke baris semasa"
+
 #, fuzzy
 #~| msgid "Repeat last search"
 #~ msgid "Repeat the last search"
@@ -2809,6 +2870,9 @@ msgstr "Terima kasih kerana menggunakan nano!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Guna satu lagi baris untuk menyunting"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Gulungan lancar"
+
 #~ msgid "Backup files"
 #~ msgstr "Salinan fail"
 
@@ -2819,11 +2883,43 @@ msgstr "Terima kasih kerana menggunakan nano!"
 #~ msgid "No conversion from DOS/Mac format"
 #~ msgstr "Tiada pertukaran dari format DOS/Mac"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Jangan tambah baris baru pada penghujung fail"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Guna satu lagi baris untuk menyunting"
+
+#, fuzzy
+#~| msgid "Set wrapping point at column #cols"
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Tetapkan titik gulungan pada lajur #lajur"
+
 #, fuzzy
 #~| msgid "Fatal error: no keys mapped for function \"%s\""
 #~ msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 #~ msgstr "Ralat maut: tiada kekunci dipetakan untuk fungsi \"%s\""
 
+#~ msgid "text add"
+#~ msgstr "tambah teks"
+
+#~ msgid "text delete"
+#~ msgstr "padam teks"
+
+#~ msgid "text replace"
+#~ msgstr "ganti teks"
+
+#~ msgid "text cut"
+#~ msgstr "potong teks"
+
+#~ msgid "text uncut"
+#~ msgstr "nyahpotong teks"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Petikan rentetan tidak sesuai %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Sekarang boleh UnJustify!"
+
 #, fuzzy
 #~| msgid "Invoke the spell checker, if available"
 #~ msgid "Invoking spell checker, please wait"
diff --git a/po/nano.pot b/po/nano.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU nano 3.2\n"
+"Project-Id-Version: GNU nano 4.0\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -28,9 +28,9 @@ msgstr ""
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr ""
 
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Can't move up a directory"
 msgstr ""
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -93,17 +93,17 @@ msgstr ""
 msgid "No current search pattern"
 msgstr ""
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr ""
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -196,7 +196,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr ""
 
@@ -300,785 +300,783 @@ msgstr ""
 msgid "File to insert [from %s]"
 msgstr ""
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr ""
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr ""
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr ""
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr ""
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr ""
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr ""
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr ""
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr ""
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr ""
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr ""
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr ""
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr ""
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr ""
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr ""
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr ""
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr ""
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr ""
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr ""
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
 msgstr ""
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr ""
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr ""
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr ""
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr ""
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr ""
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr ""
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr ""
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr ""
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr ""
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr ""
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr ""
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr ""
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr ""
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr ""
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr ""
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr ""
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr ""
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr ""
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr ""
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr ""
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr ""
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr ""
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr ""
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr ""
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr ""
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr ""
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr ""
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr ""
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr ""
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr ""
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr ""
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr ""
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr ""
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr ""
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr ""
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr ""
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr ""
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr ""
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr ""
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr ""
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr ""
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr ""
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr ""
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr ""
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr ""
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr ""
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr ""
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr ""
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr ""
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr ""
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr ""
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr ""
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr ""
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr ""
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr ""
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr ""
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr ""
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr ""
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr ""
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr ""
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr ""
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr ""
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr ""
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
 msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr ""
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr ""
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr ""
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr ""
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr ""
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr ""
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr ""
@@ -1158,59 +1156,59 @@ msgstr ""
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
 msgstr ""
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr ""
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1446,40 +1444,40 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr ""
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr ""
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr ""
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1488,622 +1486,653 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr ""
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
 msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
-msgid "Don't convert files from DOS/Mac format"
-msgstr ""
-
 #: src/nano.c:817
-msgid "Use one more line for editing"
+msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr ""
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr ""
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr ""
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr ""
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr ""
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr ""
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr ""
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr ""
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
 msgstr ""
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr ""
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr ""
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr ""
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr ""
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr ""
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr ""
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr ""
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr ""
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr ""
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr ""
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr ""
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr ""
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr ""
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr ""
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr ""
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr ""
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
@@ -2165,236 +2194,244 @@ msgstr ""
 msgid "No matching bracket"
 msgstr ""
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr ""
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr ""
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr ""
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
 msgstr ""
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr ""
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
 msgstr ""
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
 msgstr ""
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr ""
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr ""
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr ""
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr ""
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr ""
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+msgid "Justified file"
 msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
+#: src/text.c:2276
+msgid "Justified paragraph"
 msgstr ""
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr ""
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr ""
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr ""
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr ""
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr ""
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr ""
 
@@ -2420,75 +2457,79 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr ""
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr ""
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-10-01 22:22+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -32,9 +32,9 @@ msgstr "Kan ikke åpne katalog: %s"
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -49,9 +49,9 @@ msgstr "Kan ikke gå utenfor %s"
 msgid "Can't move up a directory"
 msgstr "Kan ikke bevege seg opp en katalog"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Lesefeil på %s: %s"
@@ -97,17 +97,17 @@ msgstr "Dette er eneste forekomst"
 msgid "No current search pattern"
 msgstr "Tomt søkemønster"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Ukjent syntaksnavn: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() feilet: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) feilet: %s"
@@ -201,7 +201,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu linje (%s)"
 msgstr[1] "%s -- %zu linjer (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -306,790 +306,794 @@ msgstr "Fil som skal settes inn ukonvertert [fra %s]"
 msgid "File to insert [from %s]"
 msgstr "Fil som skal settes inn [fra %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Ugyldig driftskatalog\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Klarte ikke å skrive sikkerhetskopifil, fortsette å lagre? (Si N hvis du er "
 "usikker)"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Ugyldig sikkerhetskopikatalog\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive utenfor %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Feil ved skriving av sikkerhetskopi-fil %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "For mange sikkerhetskopier?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Skrev %zu linje"
 msgstr[1] "Skrev %zu linjer"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Sikkerhetskopi]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Legg til valgt område først i fil"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Legg til valgt område sist i fil"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Skriv valgt område til fil"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Filnavn det skal legges til på slutten av"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Filnavn det skal legges til først i"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Filnavn som skal skrives til"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "For liten"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Filen eksisterer -- kan ikke overskrive"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Filen «%s» finnes, SKRIVE OVER ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Filen på disken er endret"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen ble endret etter at du åpnet den; fortsette å lagre?"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mer)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Lukk"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Angre «klipp ut»"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Avjuster"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Lukk gjeldende buffer / Avslutt nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Lagre nåværende buffer (eller markert region) til disk"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Sett inn en annen fil i gjeldende buffer (eller i ny buffer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Søk etter streng eller regulært uttrykk"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Søk bakover etter streng eller regulært uttrykk"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Søk forover etter streng"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Søk bakover etter streng"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Oppdater fillisten"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Gå til venstre kolonne"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Gå til høyre kolonne"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Gå til første rad i denne kolonnen"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Gå til siste rad i denne kolonnen"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Gå en skjerm opp"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Gå en skjerm ned"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Klipp gjeldende linje (eller markert region) og lagre den i ut"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Sett inn klippebufferet her"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Sett inn tabulatortegn ved markøren"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Vis pekerposisjon"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt streng eller regulært uttrykk"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Gå til linje- og kolonnenummer"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marker tekst fra markørposisjonen"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Kopier gjeldende linje (eller markert region) og lagre i klippebufferen"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Innrykk i gjeldende linje (eller markerte linjer)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Innrykk i gjeldende linje (eller markerte linjer)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Fjern innrykk i gjeldende linje (eller markerte linjer)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Angre siste handling"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Gjør om siste angre-operasjon"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Gå ett tegn tilbake"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Gå tett tegn frem"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Gå til forrige ord"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Gå til neste ord"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Gå til forrige linje"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Gå til neste linje"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Gå til begynnelsen av linjen"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Gå til slutten av linjen"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Gå til forrige tekstblokk"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Gå til neste tekstblokk"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til begynnelsen av avsnittet, deretter forrige avsnitt"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå akkurat utenfor slutten av avsnittet, deretter neste avsnitt"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje i filen"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Gå til siste linje i filen"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Gå til matchende brakett"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rull opp en linje uten å flytte markøren tekstlig"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rull ned en linje uten å flytte markøren tekstlig"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Bytt til forrige buffer"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Bytt til neste buffer"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Sett inn ett og ett tegn"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn tabulatortegn ved markøren"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn et linjeskift ved markøren"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Slett tegnet under peker"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett tegnet til venstre for peker"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Kutt bakover fra markøren til starten av ordet"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Kutt fremover fra markøren til starten av neste ord"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kutt fra markøren til slutten av filen"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Juster gjeldende avsnitt"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Juster hele filen"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Tell antall ord, linjer og tegn"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Tegn skjermen på nytt"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspender editoren (hvis suspensjon er aktivert)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Forsøk å fullføre det gjeldende ordet"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "(av)kommenter gjeldende linje (eller markerte linjer)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Lagre filen uten å spørre"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Søk bakover etter neste forekomst"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Søk fremover etter neste forekomst"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Start/stopp macroregistrering"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Kjør siste registrerte makro"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Inverter valg for skille mellom små og store bokstaver i søk"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Reverser søkeretning"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Regulære uttrykk av/på"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Hent tilbake forrige søk-/erstatt tekst"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Hent tilbake neste søk-/erstatt tekst"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS filformat av/på"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac filformat av/på"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Inverter valg for appendering"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Inverter valg for prependering"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Inverter valg for sikkerhetskopi av orginalfil"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Eksekver ekstern kommando"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Send (pipe) nåværende buffer (eller markert region) til disk"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Ikke konverter filer fra DOS/Mac format"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Bruk nytt buffer av/på"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Lukk buffer uten å lagre den"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Gå til fil-leser"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Gå ut av fil-leser"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Gå til første linje i listen"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Gå til siste linje i listen"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Gå til forrige fil i listen"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Gå til neste fil i listen"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Start linter, hvis tilgjengelig"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Gå til forrige lintermelding"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Gå til neste lintermelding"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Hjelp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Lagre"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Les fil"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Juster"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Erstatt"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Gå til katalog"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Klipp ut"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Send (pipe) tekst"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Gå til linje"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Angre"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Gjør om"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Følsomt for store/små bokstavar"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regulært uttrykk"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Bakover"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Ikke erstatt"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "JusterAlt"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Til klamme"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Lagre"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Søk bakover"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Forige"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Neste"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Fremover"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Neste ord"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Forrige side"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Forrige blokk"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Neste blokk"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Avsn. start"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Avsn. slutt"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Forrige side"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Neste side"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Første linje"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Siste linje"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Forrige fil"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Neste fil"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Slettetast"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Slett"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Kutt venstre"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Kutt høyre"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Ordrett"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Innrykk"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Angre «innrykk»"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Kommentarlinjer"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Fullført"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Registrer"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Kjør makro"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Marker tekst"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Til linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Lagre"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Gå til tekst"
@@ -1169,59 +1173,60 @@ msgstr "Neste Lint-melding"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Lås markørposisjon"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Jevn tekstrulling"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Bla etter linje i stedet for halvskjerm"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Myk bryting av lange linjer"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Hard bryting av lange linjer"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Musestøtte"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Linjenummerering"
 
@@ -1581,19 +1586,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Feil ved skriving %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Tasten ugyldig i visninsmodus"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Denne funksjonen er deaktivert i begrenset modus"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Hjelp er ikke tilgjengelig"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1602,7 +1607,7 @@ msgstr ""
 "\n"
 "Buffer lagret til %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1611,7 +1616,7 @@ msgstr ""
 "\n"
 "Buffer ble ikke lagret til %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1620,7 +1625,7 @@ msgstr ""
 "\n"
 "Buffer ikkr lagret: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1631,7 +1636,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1640,7 +1645,7 @@ msgstr ""
 "For å plassere markøren på en bestemt linje i en fil sett linjenummeret med\n"
 "et «+» før filnavnet. Kolonnenummeret kan legges til etter et komma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1649,282 +1654,297 @@ msgstr ""
 "Når filnavnet er «-», leser nano data fra standard inndata.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valg\t\tGNU lang brukervalg\t\tBetydning\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Aktiver smart home tast"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Ta sikkerhetskopier av eksisterende filer"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir==<kat>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Katalog for lagring av unike sikkerhetskopier"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Bruk fet, ikke invertert tekst"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Konverter skrevne tabulatorer til mellomslag"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Les en fil inn i en ny buffer som standard"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Bruk (vim-stil) låsefiler"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Logg og les historie med Søk/Erstatt tekster"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Ikke se på nanorc filer"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Gå til første rad i denne kolonnen"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringen rundt numerisk tastatus"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Legg ikke til linjeskift sist i filer"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Fjern bakre mellomrom ved hardbryting"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ikke konverter filer fra DOS/Mac format"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Bruk en ekstra linje til tekstbehandling"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Logg og les plasseringen av markøren"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <reg.uttrykk>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<reg.uttrykk>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Regulært uttrykk for å matche sitering"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Begrenset modus"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Bla etter linje i stedet for halvskjerm"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Sett bredden på en tab til # kolonner"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Bruk hurtig blanking av statuslinjen"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Skriv versjonsnummeret og avslutt"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detekter ordskille mer nøyektig"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <tekst>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<tekst>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Hvilke andre tegn er orddeler"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <navn>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<navn>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinisjon for fargekoding"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Ved myk linjebryting, bryt ved mellomrom"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ikke hardbryt lange linjer"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Vis alltid markørposisjonen"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringen rundt Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Vis markør i fil-leser"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Vis denne hjelpeteksten og avslutt"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indenter nye linjer automatisk"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Kutt fra markøren til slutten av linjen"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Vis linjenumre foran teksten"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Aktiver musstøtte"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Ikke les filen (bare skriv den)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatiingdir=<kat>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Sett gjeldende katalog"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON (^Q) og XOFF (^S) tegn"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Sett hard linjebryting ved kolonne # kolonner"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Bruk alternativt program for stavekontroll"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Autolagre ved avslutning uten spørsmål"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Lagre en fil i Unix-format som standard"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Visningsmodus (kun lesetilgang)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ikke hardbryt lange linjer"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Ikke vis hjelpelinjene"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Få CTRL+Høyre til å stoppe ved ordendene"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Tillat suspendering"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Aktiver myk linjebryting"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versjon %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s bidragsyterne til nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tNett: http://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1933,328 +1953,348 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Ingen filnavn"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Lagre endret buffer («Nei» vil forkaste endringer) ? "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Leser fra standard inndata; skriv ^D eller ^D^D for å avslutte.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Klarte ikke å åpne standard inndata: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Beklager! Nano krasjet! Kode: %d. Vennligst rapporter en feil.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Bruk «fg» for å returnere til nano\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspensjon er ikke aktivert"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "deaktivert"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Ubundet tast"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Ubundet tast: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Ubundet tast: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Ubundet tast: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Ubundet tast: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Ubundet tast: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Nøkkelnavn «%s» er ugyldig"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angitt tabulatorstørrelse «%s» er ugyldig"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Foreslått fyllbredde «%s» er ugyldig"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Skriv «%s -h» for en liste over tilgjengelige alternativer.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Ugyldig reg-uttrykk «%s»: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Feil i «%s»"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Velkommen til nano.  For grunnleggende hjelp trykk Ctrl+G"
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nei"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alle"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Feil i %s på linje %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument «%s» har en uterminert \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strenger med reg-uttrykk må begynne med et \"-tegn"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ugyldig reg-uttrykk «%s»: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "uparet sitat i syntaksnavn"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaksen «none» (ingen) er reservert"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Syntaksen «default» kan ikke ta utvidelser"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Tastenavnet er for kort"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tastebindinger må begynne med «^», «M», eller «F»"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Nøkkelnavn «%s» er ugyldig"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Må spesifisere en funksjon å binde tasten til"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kunne ikke tilordne navnet «%s» til en funksjon"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke tilordne navnet «%s» til en meny"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funksjon «%s» eksisterer ikke i menyen «%s»"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Beklager, tastekombinasjonen «%s» kan ikke rebindes"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Feil ved utviding %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Farge «%s» ikke forstått"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Bakgrunnsfarge kan ikke være lys"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "En «%s»-kommando krever en forutgående «syntaks»-kommando"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Mangler regulært uttrykk etter «%s»-kommando"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Manglende regulært uttrykk"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» forutsetter et korresponderende «end=»"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Syntaksen «default» kan ikke ta «%s»-reg-uttrykk"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Mangler argument etter «%s»"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument «%s» mangler avsluttende \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Ingen tast er bundet til funksjon «%s» i meny «%s». Avslutter.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Hvis nødvendig, bruk nano med valget -I for å justere nanorc-innstillinger.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke finne syntax «%s» for å forlenge"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Mangler valg"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukjent valg «%s»"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke tilbakestille valg «%s»"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argumentet er ikke et gyldig flerbyte-streng"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Må ha tegn som ikke er tabulator eller mellomslag"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
@@ -2316,236 +2356,249 @@ msgstr "Ikke en klamme"
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Merke satt"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Fjern merke"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil ved start av «%s»"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Kommentering er ikke støttet av denne filtypen"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Kan ikke kommentere forbi slutten av filen"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Ingenting i angrebuffer!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "Legg til tekst"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "linjeskift"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "slett tekst"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "I seksjon:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "linjesammenføy"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "erstatt tekst"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Rediger erstatning"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "klipp tekst"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "Angre «klipp ut»"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "sett inn tekst"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
+msgstr "Retning"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "Innrykk"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "Angre «innrykk»"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "Kommentar"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "Avkommenter"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Angret handling (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Ingenting å omgjøre"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Kunne ikke opprette kanal"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtering"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Klarte ikke å åpne datakanal: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Dårlig sitatstreng %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Du kan nå avjustere!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2606
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Juster hele filen"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Juster gjeldende avsnitt"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Usøkbart ord: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Neste ord ..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Kunne ikke finne størrelse på datakanal-buffer"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Feil ved start av «spell»"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Feil ved start av «sort -f»"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Ingen linter definert for denne filtypen!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Lagre endret buffer før linting?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Starter linter, vennligst vent"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fikk 0 maskinlesbare linjer fra kommando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Ved første melding"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ved siste melding"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sOrd: %zu Linjer: %zd Tegn: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Ordrett inndata"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Ingen ordfragment"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Ingen flere treff"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano er tom for minne!"
@@ -2573,89 +2626,139 @@ msgstr "For mange feil fra standard inndata"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Ukjent sekvens"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unikode inndata: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Endret"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Vis"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Begrenset modus"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Ytterligere advarsler ble undertrykt"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "linje %zd/%zd (%d%%), kolonne %zu/%zu (%d%%), tegn %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "de mange oversettere og TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte ..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tasten er ugyldig utenfor multibuffer-modus"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Angre «klipp ut»"
+
+#~ msgid "Unjustify"
+#~ msgstr "Avjuster"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Sett inn klippebufferet her"
+
 #~ msgid "PrevHstory"
 #~ msgstr "ForrigeHistorie"
 
 #~ msgid "NextHstory"
 #~ msgstr "NesteHistorie"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Jevn tekstrulling"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Legg ikke til linjeskift sist i filer"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Bruk en ekstra linje til tekstbehandling"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Sett hard linjebryting ved kolonne # kolonner"
+
+#~ msgid "text add"
+#~ msgstr "Legg til tekst"
+
+#~ msgid "text delete"
+#~ msgstr "slett tekst"
+
+#~ msgid "text replace"
+#~ msgstr "erstatt tekst"
+
+#~ msgid "text cut"
+#~ msgstr "klipp tekst"
+
+#~ msgid "text uncut"
+#~ msgstr "Angre «klipp ut»"
+
+#~ msgid "text insert"
+#~ msgstr "sett inn tekst"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Dårlig sitatstreng %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Du kan nå avjustere!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Starter stavekontroll, vennligst vent"
 
@@ -2909,9 +3012,6 @@ msgstr "Takk for at du bruker nano!"
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Kom igjen, vær litt samarbeidsvillig"
 
-#~ msgid "Direction"
-#~ msgstr "Retning"
-
 #~ msgid "Invoke the help menu"
 #~ msgstr "Vis hjelpemenyen"
 
diff --git a/po/nl.po b/po/nl.po
@@ -1,20 +1,22 @@
 # Dutch translations for GNU nano.
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# "Muchos años después..."
+# "De ene baby is een slome donder die je nog niet cadeau zou willen krijgen,
+# de andere is een wonder van lachlust en oorspronkelijkheid die je dood zou
+# willen knuffelen."
 #
 # Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011.
-# Benno Schulenberg <benno@vertaalt.nl>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Benno Schulenberg <benno@vertaalt.nl>, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
 # Erwin Poeze <erwin.poeze@gmail.com>, 2009.
 # Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
 # Guus Sliepen <guus@sliepen.eu.org>, 2003.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-3.2-pre1\n"
+"Project-Id-Version: nano-4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-10 09:28+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-18 19:19+0100\n"
 "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -34,9 +36,9 @@ msgstr "Kan map niet openen: %s"
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
@@ -51,9 +53,9 @@ msgstr "Kan niet buiten %s gaan"
 msgid "Can't move up a directory"
 msgstr "Kan niet naar bovenliggende map gaan"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout bij lezen van %s: %s"
@@ -99,17 +101,17 @@ msgstr "Dit is de enige overeenkomst"
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Onbekende syntaxnaam: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() is mislukt: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) is mislukt: %s"
@@ -203,7 +205,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu regel (%s)"
 msgstr[1] "%s -- %zu regels (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
@@ -307,788 +309,786 @@ msgstr "In te voegen bestand (ongeconverteerd) [vanuit %s]"
 msgid "File to insert [from %s]"
 msgstr "In te voegen bestand [vanuit %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Ongeldige werkmap\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Ongeldige werkmap: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
-msgstr "Ongeldige reservekopiemap\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Ongeldige reservekopiemap: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan buiten %s niets opslaan"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fout bij schrijven van reservekopiebestand %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Te veel reservekopieën?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout bij schrijven van tijdelijk bestand: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout bij schrijven van %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu regel geschreven"
 msgstr[1] "%zu regels geschreven"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-indeling]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-indeling]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Kopie maken]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Selectie toevoegen vooraan bestand"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Selectie toevoegen achteraan bestand"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Selectie opslaan in bestand"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Vooraan toevoegen aan bestand"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Achteraan toevoegen aan bestand"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Opslaan in bestand"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Te klein"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Bestand bestaat al -- mag deze niet overschrijven"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Bestand '%s' bestaat al; OVERSCHRIJVEN? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Bestand op schijf is gewijzigd"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Bestand is gewijzigd na opening; doorgaan met opslaan? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(meer)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Plakken"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "onUitvullen"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "huidige functie annuleren"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "dit hulpscherm tonen"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "huidige buffer sluiten / nano afsluiten"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "huidige buffer (of gemarkeerde regio) op schijf opslaan"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "een bestand in huidig buffer (of in nieuw buffer) invoegen"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "voorwaarts zoeken naar tekst of reguliere expressie"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "achterwaarts zoeken naar tekst of reguliere expressie"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "deel van naam voorwaarts zoeken"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "deel van naam achterwaarts zoeken"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "de bestandenlijst verversen"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "naar de linkerkolom gaan"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "naar de rechterkolom gaan"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "naar bovenste rij in deze kolom gaan"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "naar onderste rij in deze kolom gaan"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "een schermvol terugscrollen"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "een schermvol verderscrollen"
 
 # Het woord "huidige" is weggelaten, anders wordt de tekst te lang.
 # Ook zonder dat woord is het door de context duidelijk genoeg dat
 # het alleen om de huidige regel kan gaan.
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "regel (of gemarkeerde regio) knippen en bewaren in knipbuffer"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "plakken vanuit knipbuffer naar de huidige regel"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "de inhoud van de knipbuffer plakken op de cursorpositie"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "huidige cursorpositie tonen"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "spellingscontrole aanroepen (indien beschikbaar)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "tekst vervangen (of een reguliere expressie)"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "tekst markeren vanaf huidige cursorpositie"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "huidige regel (of gemarkeerde regio) kopiëren naar knipbuffer"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "huidige regel (of gemarkeerde regio) weggooien"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "huidige regel (of gemarkeerde regels) laten inspringen"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "huidige regel (of gemarkeerde regels) laten terugspringen"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "de laatste bewerking ongedaan maken"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "de laatst ongedaangemaakte bewerking herdoen"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "één teken achteruit"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "één teken vooruit"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "één woord achteruit"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "één woord vooruit"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "naar de voorgaande regel"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "naar de volgende regel"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "naar het begin van de huidige regel"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "naar het eind van de huidige regel"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "naar voorgaand tekstblok"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "naar volgend tekstblok"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "naar het begin van huidige alinea; daarna naar vorige"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "naar het eind van huidige alinea; daarna naar volgende"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "naar de eerste regel (top) van het bestand"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "naar de laatste regel (eind) van het bestand"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "naar bijbehorend haakje gaan"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "één regel terugscrollen (cursor niet verplaatsen in tekst)"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "één regel vooruitscrollen (cursor niet verplaatsen in tekst)"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "overschakelen naar voorgaande bestandsbuffer"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "overschakelen naar volgende bestandsbuffer"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "eerstvolgende toetsaanslag verbatim invoegen"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "een tab invoegen op de cursorpositie"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "een regeleinde invoegen op de cursorpositie"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "het teken onder de cursor verwijderen"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "het teken links van de cursor verwijderen"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
 msgstr "achterwaarts verwijderen tot begin van woord"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
 msgstr "voorwaarts verwijderen tot begin van volgend woord"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "de hele rest van het bestand knippen (vanaf de cursor)"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "huidige alinea uitvullen"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "het gehele bestand uitvullen"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "aantal woorden, regels en tekens in het bestand tellen"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "het scherm verversen (opnieuw tekenen)"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "de editor laten pauzeren (indien pauzering is ingeschakeld)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "proberen het huidige woord te vervolledigen"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "commentaartekens invoegen/verwijderen (op gemarkeerde regels)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "bestand opslaan zonder te vragen"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "volgende voorkomen achterwaarts zoeken"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "volgende voorkomen voorwaarts zoeken"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "opname van macro starten/stoppen"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "de laatst opgenomen macro afspelen"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "hoofdlettergevoeligheid aan-/uitzetten"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "de zoekrichting omdraaien"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "gebruik van reguliere expressies aan-/uitzetten"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "eerdere zoek-/vervangtekst oproepen"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "latere zoek-/vervangtekst oproepen"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS-indeling aan-/uitzetten"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac-indeling aan-/uitzetten"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "achteraantoevoegen aan-/uitzetten"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "vooraantoevoegen aan-/uitzetten"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "maken van reservekopieën aan-/uitzetten"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "externe opdracht uitvoeren"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "buffer (of gemarkeerde regio) naar het commando sluizen"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "omzetten uit DOS/Mac-opmaak aan-/uitzetten"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "gebruik van een nieuwe buffer aan-/uitzetten"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "buffer sluiten zonder op te slaan"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "bestandenlijst oproepen"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "bestandenlijst verlaten"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "naar het eerste bestand in de lijst gaan"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "naar het laatste bestand in de lijst gaan"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "naar het vorige bestand in de lijst gaan"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "naar het volgende bestand in de lijst gaan"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "naar een op te geven map gaan"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "een linter aanroepen (syntaxcontrole, indien beschikbaar)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "naar de voorgaande lintermelding springen"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "naar de volgende lintermelding springen"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Hulp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Opslaan"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Inlezen"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Uitvullen"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Zoeken"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Vervangen"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Naar map"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Knippen"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Plakken"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Spelling"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Positie"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Naar regel"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Herdoen"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Hfdlgevoelig"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Reg.exp."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Achterwaarts"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Zoeken"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Eerdere"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Latere"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "VolUitvullen"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Naar haakje"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Opslaan"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Terugzoeken"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Voorgaande"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Vooruit"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Woord verder"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Regel terug"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Regel verder"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Blok terug"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Blok verder"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Beg.v.alinea"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Eind v.alinea"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Blad terug"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Blad verder"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Naar top"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Naar eind"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Vorig bestand"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Volgend bestand"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Wis links"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Links kappen"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Wis rechts"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Rechts kappen"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Pauzeren"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Inspringen"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Terugspringen"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Commentariseren"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completeren"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Opnemen"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Afspelen"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Weggooien"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Opslaan"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Zoeken"
@@ -1168,59 +1168,59 @@ msgstr "Volgend Lintbericht"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Per regel scrollen"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "sprongsgewijs scrollen (per half scherm)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Zachte terugloop van te lange regels"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Knippen vanaf cursor tot regeleinde"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Afbreking van lange regels"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Regelnummers"
 
@@ -1597,19 +1597,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Fout bij schrijven van %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Toets is ongeldig in Kijkmodus"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Deze functie is uitgeschakeld in beperkte modus"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Hulp is niet beschikbaar"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1618,7 +1618,7 @@ msgstr ""
 "\n"
 "Buffer is geschreven naar %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1627,7 +1627,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven naar %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1636,7 +1636,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1647,7 +1647,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1657,7 +1657,7 @@ msgstr ""
 "een '+' voor de bestandsnaam.  Een kolomnummer kunt u toevoegen na een "
 "komma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1666,283 +1666,295 @@ msgstr ""
 "Als een bestandsnaam '-' is, dan leest nano van standaardinvoer.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Optie\t\tLange optie\t\t  Betekenis\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "slimme Home-toets inschakelen"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "van bestaand bestand reservekopie maken"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <map>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<map>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "unieke reservekopieën maken, in deze map"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "vet in plaats van invers gebruiken"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "getypte tabs omzetten naar spaties"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "inlezen standaard in apart buffer doen"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "(vim-)vergrendelingsbestanden gebruiken"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "zoek/vervangteksten bewaren en gebruiken"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "eventuele nanorc-bestanden negeren"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "een gidslijn tonen in deze kolom"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "toetsverwarring numeriek bordje oplossen"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "geen regeleindeteken toevoegen aan slot"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "geen magisch regeleindeteken [standaard]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "eindspaties verwijderen bij afbreken"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "bestand niet omzetten uit DOS/Mac-opmaak"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "bewerkingsvenster een beetje vergroten"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "cursorpositie bewaren, later herstellen"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <reg.exp.>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<reg.exp.>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "expressie die met aanhaling overeenkomt"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "toegang tot bestandssysteem beperken"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "per regel scrollen i.p.v. half scherm"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <getal>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<getal>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "te gebruiken tabbreedte"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "statusregel na één toetsaanslag wissen"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "programmaversie tonen en stoppen"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "woordgrenzen nauwkeuriger bepalen"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <tekens>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<tekens>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "welke andere tekens woordvormend zijn"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <naam>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<naam>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "te gebruiken syntax (voor kleuring)"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Bsp en Del wissen een gemarkeerde regio"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "bij zachtafbreken, dit op witruimte doen"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "een lange regel automatisch afbreken"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "cursorpositie voortdurend tonen"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Backspace/Delete-verwarring oplossen"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "regel onder de titelbalk leeg laten"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "tekst met regeleindeteken eindigen"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "cursor tonen in bestandenlijst & hulp"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "deze hulptekst tonen en stoppen"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "automatisch inspringen van nieuwe regels"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "per halfscherm scrollen, niet per regel"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "vanaf cursor knippen i.p.v. hele regel"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "regelnummers weergeven voor de tekst"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "gebruik van de muis mogelijk maken"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "bestand niet lezen (alleen schrijven)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <map>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<map>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "deze werkmap gebruiken"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON- en XOFF-toetsen behouden (^Q en ^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <getal>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<getal>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "te gebruiken afbreek-/uitvulbreedte"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "de breedte voor afbreken en uitvullen"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <programma>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<programma>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "deze spellingscontroleur gebruiken"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "automatisch opslaan bij afsluiten"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "bestand standaard in Unix-opmaak opslaan"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "kijkmodus (alleen lezen, geen bewerking)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "lange regels niet afbreken"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "lange regels niet afbreken [standaard]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "niet de twee hulpregels tonen"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Rechts laten stoppen na woordeindes"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "pauzeren van editor toestaan"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "rest van lange regels tonen op volgende"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versie %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s de bijdragers aan nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 " E-mail: <nano@nano-editor.org>  Website: https://nano-editor.org/\n"
 " Meld fouten in de vertaling aan <vertaling@vrijschrift.org>."
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1951,329 +1963,348 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Geen bestandsnaam"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Gewijzigde buffer opslaan?  (bij 'N' gaan WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Lezen van standaardinvoer; typ ^D of ^D^D om te stoppen.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Openen van standaardinvoer is mislukt: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Sorry! Nano is gecrasht!  Code: %d.  Deze fout graag rapporteren.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Pauzering is niet ingeschakeld"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr " (aangezet)"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Ongebonden toets"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Onbindbare toets: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Ongebonden toets: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Onbindbare toets: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Ongebonden toets: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Ongebonden toets: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Gidskolom '%s' is ongeldig"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Optie %s wordt genegeerd; het is de standaard\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Typ '%s -h' voor een lijst van beschikbare opties.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Onjuiste reguliere expressie '%s': %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Fouten in '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Welkom bij nano.  Voor basishulp, typ Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Jj"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
 # Accepteert ook de "O" van "Overal":
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "AaOo"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nee"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alle"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Fout in %s op regel %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reguliere expressies moeten tussen \"-tekens staan"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Ontbrekende syntaxnaam"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Ongepaard aanhalingsteken in syntaxnaam"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Het woordje 'none' is gereserveerd"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "De syntax 'default' accepteert geen extensies"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Ontbrekende toetsnaam"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Toetsnaam is te kort"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Toetsnaam moet beginnen met \"^\", \"M\", of \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Toetsnaam %s is ongeldig"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Functie waaraan de toets gebonden moet worden ontbreekt"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Menu waarin de toets gebonden/ontbonden moet worden ontbreekt (of \"all\")"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan in naam '%s' geen functie herkennen"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan in naam '%s' geen menu herkennen"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Functie '%s' bestaat niet in menu '%s'"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr "Toets '%s' mag niet herbonden worden"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fout bij expanderen van %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Kleur '%s' is onbekend"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Een achtergrondkleur kan niet 'bright' zijn"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Een '%s'-commando vereist een voorafgaand 'syntax'-commando"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Ontbrekende reguliere expressie na '%s'-commando"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Lege tekenreeks"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "De syntax 'default' accepteert geen '%s' ding"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Ontbrekend argument na '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument van '%s' heeft geen afsluitend aanhalingsteken"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Aan functie '%s' in menu '%s' is geen toets gebonden.  Gestopt.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Start eventueel nano met optie -I om uw nanorc te corrigeren.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Onbekende optie '%s'"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan optie '%s' niet uitzetten"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argument is geen geldige multibyte-tekenreeks"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
@@ -2335,236 +2366,244 @@ msgstr "Is geen haakje"
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Markering is aangezet"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Uitgezet"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fout bij aanroepen van '%s'"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Commentariseren is niet mogelijk in dit bestandstype"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Kan niet commentariseren voorbij einde van bestand"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr "Toevoeging"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "Regelafbreking"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
 msgstr "Verwijdering"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "Regelsamenvoeging"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
 msgstr "Vervanging"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "Wissen"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr "Knippen"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr "Plakken"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
 msgstr "Invoeging"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "Inspringing"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "Terugspringing"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "Commentering"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "Oncommentering"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr "%s is ongedaan gemaakt"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Er is niets om opnieuw te doen"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr "%s is opnieuw gedaan"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "Filtering"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Openen van pijp is mislukt: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "Uitvullen"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Selectie is uitgevuld"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Kan nu onuitvullen!"
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Gehele buffer is uitgevuld"
 
-#: src/text.c:2606
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Alinea is uitgevuld"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Onvindbaar woord: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Geef de vervanging"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Volgend woord..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Aanmaken van lijst van verkeerd gespelde woorden; even geduld..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Fout bij aanroepen van 'spell'"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Fout bij aanroepen van 'sort -f'"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Er is geen linter gedefinieerd voor dit type bestand"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Gewijzigd buffer opslaan alvorens te linten?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Aanroepen van de linter; even geduld..."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Melding is voor ongeopend bestand %s; in nieuwe buffer openen?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Geen berichten voor dit bestand"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Dit is de eerste melding"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Dit is de laatste melding"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%s%zu woorden,  %zd regels,  %zu tekens"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Verbatim invoer"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Geen woordfragment"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Geen verdere mogelijkheden"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Geen overeenkomsten"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Onvoldoende geheugen beschikbaar voor nano!\n"
 
@@ -2590,79 +2629,125 @@ msgstr "Te veel fouten vanaf standaardinvoer\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Onbekende toetscode"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Invoer van Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Linten --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Kijken"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Beperkt"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Verdere waarschuwingen zijn onderdrukt"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "regel %zd/%zd (%d%%), kolom %zu/%zu (%d%%), teken %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "de vele vertalers en de TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Plakken"
+
+#~ msgid "Unjustify"
+#~ msgstr "onUitvullen"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "plakken vanuit knipbuffer naar de huidige regel"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Per regel scrollen"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "geen regeleindeteken toevoegen aan slot"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "bewerkingsvenster een beetje vergroten"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "te gebruiken afbreek-/uitvulbreedte"
+
+#~ msgid "text add"
+#~ msgstr "Toevoeging"
+
+#~ msgid "text delete"
+#~ msgstr "Verwijdering"
+
+#~ msgid "text replace"
+#~ msgstr "Vervanging"
+
+#~ msgid "text cut"
+#~ msgstr "Knippen"
+
+#~ msgid "text uncut"
+#~ msgstr "Plakken"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Kan nu onuitvullen!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "In Kijkmodus is deze toets alleen geldig in multibuffermodus"
 
@@ -2866,12 +2951,3 @@ msgstr "Dank u voor het gebruiken van nano!"
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Fout tijdens schrijven van reservekopiebestand %s: een ander is eigenaar"
-
-#~ msgid "line wrap"
-#~ msgstr "regelterugloop"
-
-#~ msgid "line split"
-#~ msgstr "regelsplitsing"
-
-#~ msgid "line cut"
-#~ msgstr "regelwegneming"
diff --git a/po/nn.po b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -29,9 +29,9 @@ msgstr "Kan ikkje skifta til foreldrekatalogen"
 msgid "Go To Directory"
 msgstr "G� til katalog"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Avbrote"
 
@@ -46,9 +46,9 @@ msgstr "Kan ikkje skriva utanfor %s"
 msgid "Can't move up a directory"
 msgstr "Kan ikkje skifta til foreldrekatalogen"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -94,17 +94,17 @@ msgstr "Dette er einaste forekomst"
 msgid "No current search pattern"
 msgstr ""
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr ""
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -197,7 +197,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -303,860 +303,855 @@ msgstr "Fila som skal setjast inn [fr
 msgid "File to insert [from %s]"
 msgstr "Fila som skal setjast inn [fr� %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr " -o [kat] \tSet aktiv filkatalog\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Kan ikkje skifta til foreldrekatalogen"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikkje skriva utanfor %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s vart ikkje lagra (for mange sikringskopiar?)\n"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Skreiv %d linjer"
 msgstr[1] "Skreiv %d linjer"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Bakover]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Legg til valt omr�de p� slutten av fil"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Legg til valt omr�de p� slutten av fil"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Lagra valt omr�de til fil"
 
-#: src/files.c:2127
+#: src/files.c:2122
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Namn p� fil som skal leggjast til"
 
-#: src/files.c:2128
+#: src/files.c:2123
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Namn p� fil som skal leggjast til"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Namn p� fila som skal lagrast"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr ""
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Fila eksisterer, SKRIV OVER?"
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(meir)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Lukk"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "U-klipp"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-msgstr "U-ombrekk"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "S�k bakover"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr ""
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Set inn utklippsbufferet her"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Marker teksten ved mark�ren"
 
-#: src/global.c:567
+#: src/global.c:561
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Vis mark�rposisjonen"
 
-#: src/global.c:569
+#: src/global.c:563
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:571
+#: src/global.c:565
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt feila: ukjent deluttrykk!"
 
-#: src/global.c:572
+#: src/global.c:566
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Hopp til eit linjenummer"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Marker teksten ved mark�ren"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:577
 #, fuzzy
 msgid "Go back one character"
 msgstr "G� ein bokstav attende"
 
-#: src/global.c:584
+#: src/global.c:578
 #, fuzzy
 msgid "Go forward one character"
 msgstr "G� ein bokstav fram"
 
-#: src/global.c:585
+#: src/global.c:579
 #, fuzzy
 msgid "Go back one word"
 msgstr "G� ein bokstav attende"
 
-#: src/global.c:586
+#: src/global.c:580
 #, fuzzy
 msgid "Go forward one word"
 msgstr "G� ein bokstav fram"
 
-#: src/global.c:587
+#: src/global.c:581
 #, fuzzy
 msgid "Go to previous line"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:588
+#: src/global.c:582
 #, fuzzy
 msgid "Go to next line"
 msgstr "G� ei linje ned"
 
-#: src/global.c:589
+#: src/global.c:583
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "G� til starten av linja"
 
-#: src/global.c:590
+#: src/global.c:584
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "G� til slutten av linja"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:602
+#: src/global.c:596
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:605
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:609
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:616
+#: src/global.c:610
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under mark�ren"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for mark�ren"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
 msgstr ""
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
 msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:630
+#: src/global.c:624
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Teikn skjermen p� nytt"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 #, fuzzy
 msgid "Search next occurrence backward"
 msgstr "S�k bakover"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr ""
 
-#: src/global.c:655
+#: src/global.c:649
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "S�k (skil mellom store og sm� bokstavar)"
 
-#: src/global.c:657
+#: src/global.c:651
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Vis mark�rposisjonen"
 
-#: src/global.c:659
+#: src/global.c:653
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Bruk regul�re uttrykk"
 
-#: src/global.c:662
+#: src/global.c:656
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "G� til f�rre skjerm"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:667
+#: src/global.c:661
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Skriv fila p� DOS-format"
 
-#: src/global.c:668
+#: src/global.c:662
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Skriv fila p� Mac-format"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Inga omsetjing fr� DOS/Mac-format"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "G� til fillesar"
 
-#: src/global.c:683
+#: src/global.c:677
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "G� til fillesar"
 
-#: src/global.c:684
+#: src/global.c:678
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:685
+#: src/global.c:679
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:686
+#: src/global.c:680
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "G� til f�rste linje i fila"
 
-#: src/global.c:687
+#: src/global.c:681
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "G� til siste linje i fila"
 
-#: src/global.c:688
+#: src/global.c:682
 #, fuzzy
 msgid "Go to directory"
 msgstr "G� til katalog"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr ""
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr ""
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Hjelp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "Lagra"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Les fil"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Brekk om"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Frisk opp"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Erstatt"
 
-#: src/global.c:760
+#: src/global.c:754
 #, fuzzy
 msgid "Go To Dir"
 msgstr "G� til katalog"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Klipp"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Klipp"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 #, fuzzy
 msgid "Go To Line"
 msgstr "G� til linje"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:805
+#: src/global.c:797
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Store/sm�"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Reguttrykk"
 
-#: src/global.c:813
+#: src/global.c:805
 #, fuzzy
 msgid "Backwards"
 msgstr " [Bakover]"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Inga erstatting"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 #, fuzzy
 msgid "FullJstify"
 msgstr "Brekk om"
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Finn"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "F�rre fil"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "Neste side"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Framover"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "End"
 
-#: src/global.c:882
+#: src/global.c:885
 #, fuzzy
 msgid "Prev Line"
 msgstr "F�rre side"
 
-#: src/global.c:884
+#: src/global.c:887
 #, fuzzy
 msgid "Next Line"
 msgstr "Neste fil"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr ""
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Neste fil"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr ""
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "F�rre side"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Neste side"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "F�rste linje"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Siste linje"
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "F�rre fil"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Neste fil"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Klipp"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr ""
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "G� til linje"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Merk tekst"
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "G� til linje"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr ""
@@ -1241,62 +1236,62 @@ msgstr ""
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1400
+#: src/global.c:1410
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast mark�rposisjon"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Jamn linjerulling"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr ""
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr " -w \t\tIkkje bryt lange linjer\n"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Musest�tte"
 
-#: src/global.c:1422
+#: src/global.c:1432
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1424
+#: src/global.c:1434
 #, fuzzy
 msgid "Line numbering"
 msgstr "Skriv linjenummer"
@@ -1647,21 +1642,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr ""
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Tasten er ulovleg i VIS-modus"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Kan ikkje g� til foreldrekatalogen i avgrensa modus"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1670,7 +1665,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1679,7 +1674,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1688,7 +1683,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1697,311 +1692,324 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsjon\t\tLang opsjon\t\tTyding\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr ""
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
 msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 #, fuzzy
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Inga omsetjing fr� DOS/Mac-format"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr ""
-
-#: src/nano.c:821
+#: src/nano.c:822
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Fast mark�rposisjon"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr ""
 
-#: src/nano.c:825
+#: src/nano.c:826
 #, fuzzy
 msgid "Regular expression to match quoting"
 msgstr "S�k etter regul�rt uttrykk"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr ""
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:833
+#: src/nano.c:831
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr " -T [TAL]\tSet breidda p� tabulator til TAL\n"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:833
 #, fuzzy
 msgid "Print version information and exit"
 msgstr " -V \t\tSkriv ut versjonsnummer og avslutt\n"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr " -i \t\tAutomatisk linjeinnrykk\n"
+
+#: src/nano.c:852
 #, fuzzy
 msgid "Constantly show cursor position"
 msgstr " -c \t\tFast mark�rposisjon\n"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:863
 #, fuzzy
 msgid "Automatically indent new lines"
 msgstr " -i \t\tAutomatisk linjeinnrykk\n"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 #, 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:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:872
+#: src/nano.c:878
 #, fuzzy
 msgid "Set operating directory"
 msgstr " -o [kat] \tSet aktiv filkatalog\n"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:882
+#: src/nano.c:888
 #, fuzzy
 msgid "Enable alternate speller"
 msgstr " -s [PROG]  \tBruk PROG til stavesjekk\n"
 
-#: src/nano.c:884
+#: src/nano.c:890
 #, fuzzy
 msgid "Auto save on exit, don't prompt"
 msgstr " -t \t\tLagra utan � sp�rja ved avslutning\n"
 
-#: src/nano.c:886
+#: src/nano.c:892
 #, fuzzy
 msgid "Save a file by default in Unix format"
 msgstr "Skriv fila p� DOS-format"
 
-#: src/nano.c:888
+#: src/nano.c:894
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr " -v \t\tVis-modus (berre lesing)\n"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr " -w \t\tIkkje bryt lange linjer\n"
 
-#: src/nano.c:892
+#: src/nano.c:898
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr " -x \t\tIkkje vis hjelpevindu\n"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 #, fuzzy
 msgid "Enable suspension"
 msgstr " -z \t\tTillat � leggja programmet i bakgrunnen\n"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tVev: http://www.nano-editor.org"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2010,336 +2018,355 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 #, fuzzy
 msgid "No file name"
 msgstr "filnamnet er %s"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, fuzzy, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Kunne ikkje opna %s for skriving: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "p�"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr ""
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr ""
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nei"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alle"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Feil i %s p� linje %d: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk m� starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna �%s�: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 #, fuzzy
 msgid "Missing syntax name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr ""
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr ""
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 #, fuzzy
 msgid "Missing key name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr ""
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgid "Keystroke %s may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forst�eleg"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr ""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr ""
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar �start=� m� der vera ein �end=�"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr ""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr ""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forst�eleg"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikkje endra storleik p� toppvindauget"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
@@ -2404,246 +2431,254 @@ msgstr "Ikkje ei klamme"
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Merke sett"
 
-#: src/text.c:67
+#: src/text.c:61
 #, fuzzy
 msgid "Mark Unset"
 msgstr "Merke fjerna"
 
-#: src/text.c:77
+#: src/text.c:71
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s p� linje %d: "
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr ""
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
 msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr ""
 
-#: src/text.c:759 src/text.c:939
-#, fuzzy
-msgid "text delete"
-msgstr "Neste fil"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr ""
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr ""
 
-#: src/text.c:788 src/text.c:967
+#: src/text.c:596 src/text.c:776
 #, fuzzy
-msgid "text replace"
-msgstr " (� erstatta)"
+msgid "replacement"
+msgstr "Rediger erstatning"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
 msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
 msgstr ""
 
-#: src/text.c:819 src/text.c:999
+#: src/text.c:628 src/text.c:808
 #, fuzzy
-msgid "text insert"
-msgstr "Neste fil"
+msgid "insertion"
+msgstr "Retning"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Automatisk innrykk"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Automatisk innrykk"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
+msgid "Undid %s"
 msgstr ""
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
+msgid "Redid %s"
 msgstr ""
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 #, fuzzy
 msgid "Could not create pipe"
 msgstr "Kunne ikkje oppretta mellombels fil: %s"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Kan ikkje opna ~/.nanorc, %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+msgid "Justified file"
 msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Du kan no gjera om ombrekkinga!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Brekk om avsnittet"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr ""
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullf�rt"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr ""
 
-#: src/text.c:3416
+#: src/text.c:3180
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Legg til valt omr�de p� slutten av fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Inga motsvarande klamme"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano: malloc: tom for minne!"
@@ -2670,79 +2705,83 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr ""
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Endra"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr ""
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "linje %d/%d (%.0f%%), kol %ld/%ld (%.0f%%), teikn %ld/%ld (%.0f%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi gl�ymde..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
@@ -2789,6 +2828,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Writing file in Mac format"
 #~ msgstr "Skriv fil p� Mac-format"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Jamn linjerulling"
+
 #~ msgid "Auto wrap"
 #~ msgstr "Automatisk linjebrekking"
 
@@ -2834,6 +2876,12 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Open next loaded file"
 #~ msgstr "Opna neste leste fil"
 
+#~ msgid "UnJustify"
+#~ msgstr "U-ombrekk"
+
+#~ msgid "UnCut Txt"
+#~ msgstr "U-klipp"
+
 #~ msgid "Up"
 #~ msgstr "Opp"
 
@@ -2843,9 +2891,6 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Find Other Bracket"
 #~ msgstr "Finn den andre klamma"
 
-#~ msgid "Direction"
-#~ msgstr "Retning"
-
 #~ msgid "Goto"
 #~ msgstr "G� til"
 
@@ -3019,6 +3064,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Cannot move bottom win"
 #~ msgstr "Kan ikkje flytta botnvindauget"
 
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Du kan no gjera om ombrekkinga!"
+
 #~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 #~ msgstr ""
 #~ "NumLock-feil oppdaga. Nummer-tastane vil fungere feil med NumLock av"
diff --git a/po/pl.po b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-09-25 20:39+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -31,9 +31,9 @@ msgstr "Nie można otworzyć katalogu: %s"
 msgid "Go To Directory"
 msgstr "Przejdź do katalogu"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Anulowano"
 
@@ -48,9 +48,9 @@ msgstr "Nie można wyjść poza katalog %s"
 msgid "Can't move up a directory"
 msgstr "Nie można przejść do katalogu wyżej"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Błąd odczytu %s: %s"
@@ -96,17 +96,17 @@ msgstr "To jedyne wystąpienie"
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nieznana nazwa składni: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "błąd magic_load(): %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "błąd magic_file(%s): %s"
@@ -200,7 +200,7 @@ msgstr[0] "%s -- %zu linia (%s)"
 msgstr[1] "%s -- %zu linie (%s)"
 msgstr[2] "%s -- %zu linii (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
@@ -309,48 +309,50 @@ msgstr "Plik do odczytu bez konwersji [z %s]"
 msgid "File to insert [from %s]"
 msgstr "Plik do wstawienia [z %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Niepoprawny katalog bieżący\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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 "
 "jesteś pewien)"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Niepoprawny katalog kopii zapasowych\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nie można zapisać poza %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Błąd zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Za wiele kopii zapasowych?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Błąd zapisu pliku tymczasowego: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Błąd zapisu %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -358,741 +360,743 @@ msgstr[0] "Zapisano %zu linię"
 msgstr[1] "Zapisano %zu linie"
 msgstr[2] "Zapisano %zu linii"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [format DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [format Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Kopia zap.]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Wpisz wybór na początek pliku"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Dopisz wybór do pliku"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Zapisz wybór do pliku"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nazwa pliku do wpisania"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nazwa pliku do dopisania"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nazwa pliku do zapisu"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Zbyt mały"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Plik istnieje -- nie można zastąpić"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Zapisać plik pod INNĄ NAZWĄ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Plik \"%s\" istnieje; ZAMAZAĆ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Plik na dysku uległ zmianie"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Plik został zmodyfikowany po otworzeniu go, kontynuować zapis? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(więcej)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Odnów Tekst"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Cofnij just."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Anuluj bieżącą funkcję"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Wyświetla ten tekst pomocy"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Zamknij bieżący bufor / Wyjdź z nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Zapisz bieżący plik (zaznaczony tekst) na dysk"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Wstaw inny plik do bieżącego (lub nowego) bufora"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Szukaj łańcucha lub wyrażenia regularnego"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Szukaj łańcucha lub wyrażenia regularnego w tył"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Szukaj łańcucha do przodu"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Szukaj łańcucha wstecz"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Odśwież listę plików"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Przejdź do lewej kolumny"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Przejdź do prawej kolumny"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Przejdź do pierwszego wierszu w tej kolumnie"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Przejdź do ostatniego wierszu w tej kolumnie"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Przejdź do poprzedniego ekranu"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Przejdź do następnego ekranu"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Wytnij bieżącą linię (lub oznaczony tekst) i zapisz do schowka"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Wklej zawartość schowka w bieżącej linii"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Wstaw znak tabulacji na pozycji kursora"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Pokaż informację o pozycji kursora"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Wywołaj sprawdzanie pisowni, jeśli dostępne"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Zamień łańcuch lub wyrażenie regularne"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Przejdź do linii i kolumny"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Ustaw znacznik w bieżącym położeniu kursora"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Skopiuj bieżącą linię (lub zaznaczony tekst) i zapisz do schowka"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Wcięcie bieżącej linii lub oznaczonych linii"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Wcięcie bieżącej linii lub oznaczonych linii"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Odwróć wcięcie bieżącej linii lub oznaczonych linii"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Odwołaj ostatnią operację"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Odtwórz ostatnią operację"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Przejdź o znak wstecz"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Przejdź o znak do przodu"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Przejdź o słowo wstecz"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Przejdź o słowo do przodu"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Przejdź do poprzedniej linii"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Przejdź do następnej linii"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Przejdź na początek bieżącej linii"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Przejdź na koniec bieżącej linii"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Przejdź do poprzedniego bloku tekstu"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Przejdź do następnego bloku tekstu"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Przejdź do pierwszej linii pliku"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Przejdź do ostatniej linii pliku"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Przejdź do parzystego nawiasu"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Przewiń na jedną linię w górę bez przesunięcia kursora w tekście"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Przewiń na jedną linię w dół bez przesunięcia kursora w tekście"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Przejdź do poprzedniego bufora"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Przejdź do następnego bufora"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Wstaw następne naciśnięcie klawisza dosłownie"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Wstaw znak nowej linii na pozycji kursora"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Usuń znak na pozycji kursora"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Usuń znak na lewo od kursora"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Wycina wstecz od kursora do początku słowa"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Wycina od kursora do początku następnego słowa"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Wytnij wszystko z pozycji kursora po koniec pliku"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Wyjustuj bieżący akapit"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Wyjustuj cały plik"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Policz ilość słów, linii i znaków"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Odśwież (ponownie wyświetl) bieżący ekran"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Zawieś edytor (jeżeli zawieszenie jest włączone)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Uzupełnij bieżące słowo"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Zakomentuj/odkomentuj bieżącą linię (lub oznaczone linii)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Zapisać plik bez podpowiedzi"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Szukanie wstecz"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Szukanie naprzód"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Rozpocznij/zakończ nagrywanie makra"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Uruchom ostatnio nagrane makro"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Przełącz uwzględnienie rozmiaru znaków pod czas wyszukiwania"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Odwróć kierunek wyszukiwania"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Przełącz użycie wyrażeń regularnych"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Przywróć poprzednie łańcuchy wyszukiwania/zamiany"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Przywróć następne łańcuchy wyszukiwania/zamiany"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Przełącz użycie formatu DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Przełącz użycie formatu Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Przełącz dopisywanie w koniec"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Przełącz dopisywanie na początek"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Przełącz utworzenie kopii zapasowych oryginalnego pliku"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Wywołaj polecenie zewnętrzne"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Przekaż bieżący plik (zaznaczony tekst) do polecenia"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Przełącz użycie nowego bufora"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Zamknij bufor bez zapisu"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Pokaż przeglądarkę plików"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Wyjdź z przeglądarki plików"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Przejdź do pierwszego pliku na liście"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Przejdź do ostatniego pliku na liście"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Przejdź do poprzedniego pliku na liście"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Przejdź do następnego pliku na liście"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Przejdź do katalogu"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Wywołaj sprawdzanie składni, jeśli dostępne"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Przejdź do poprzedniej linii"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Przejdź do następnej linii"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Pomoc"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Zapisz"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Wczyt.plik"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Wyjustuj"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Wyszukaj"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Zastąp"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Do kat."
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Wytnij"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Przekaż tekst"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Pisownia"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Bież.poz."
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Przejdź do linii"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Odwołaj"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Odtwórz"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopiuj"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Wielk.liter"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Wyr.reg."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Wstecz"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Nie zast."
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Wyjustuj"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Do nawiasu"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Zapisz"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Gdzie było"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Następny"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "W przód"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Poprz.słowo"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Nast.słowo"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Początek"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Poprz.lin."
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Nast. lin."
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "W górę"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "W dół"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Poprz.Block"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Nast.Block"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "PoczAkapit"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "KonAkapit"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Poprz.str."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Nast.str."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Pierw.lin."
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Ost.lin."
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Plik poprz."
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Plik nast."
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Usuń"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Wytnij w lewo"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Wytnij w prawo"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "WytnDoKonc"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Ilość słów"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Dosłownie"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Zawieś"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Wcięcie"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Usuń wcięcie"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Zakomentuj linii"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Skończono"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Zapis"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Uruchom makro"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Zaznacz"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Składnia"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Zapisz"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Do tekstu"
@@ -1172,59 +1176,60 @@ msgstr "Lint:Nast.lin."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Stałe położenie kursora"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Płynne przewijanie"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Przewija po liniach zamiast po pół-ekranu"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Miękkie zawijanie długich linii"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Wyświetlanie białych znaków"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Kolorowanie składni"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Rozumny klawisz \"w początek\""
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Auto wcięcia"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Wytnij do końca"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Twarde zawijanie długich linii"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Przetworzenie tabulacji na spacji"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Obsługa myszy"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Zawieś"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numeracja linii"
 
@@ -1592,19 +1597,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Błąd zapisu %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Klawisz niedozwolony w trybie przeglądania"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Ta funkcja nie jest dostępna w trybie ograniczonym"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Pomoc niedostępna"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1613,7 +1618,7 @@ msgstr ""
 "\n"
 "Bufor zapisany w %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1622,7 +1627,7 @@ msgstr ""
 "\n"
 "Bufor nie został zapisany w %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1631,7 +1636,7 @@ msgstr ""
 "\n"
 "Bufor nie został zapisany w %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1642,7 +1647,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1653,7 +1658,7 @@ msgstr ""
 "numer linii poprzedzony znakiem '+'. Można również podać numer kolumny,\n"
 "oddzielony przecinkiem.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1662,282 +1667,297 @@ msgstr ""
 "Gdy podano '-' jako nazwę pliku, nano odczytuje dane z wejścia "
 "standardowego.\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcja\t\tDługa opcja GNU\t\tZnaczenie\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Włącza rozumny przycisk \"w początek\""
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Tworzenie kopii zapasowych istniejących plików"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <katalog>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<katalog>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Katalog przechowywania unikatowych kopii zapasowych"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Używa tekstu pogrubionego zamiast negacji obrazu"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Przetwarza tabulacje na spacje"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Domyślny odczyt pliku do nowego bufora"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Używaj plików blokowania w stylu vim"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany łańcuchów"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Bez korzystania z plików nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Przejdź do pierwszego wierszu w tej kolumnie"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy klawiatury numerycznej"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Wyłącza dodanie znaku nowej linii na końcu pliku"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Usuwaj białe znaki z końca linii pod czas twardego zawijania"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Użycie dodatkowej linii do redagowania"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Zapisz i odczytaj pozycję kursora"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Wyrażenie regularne pasujące do cudzysłowu"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Tryb zastrzeżony"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Przewija po liniach zamiast po pół-ekranu"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#kol>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kol>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Ustawienie szerokości tabulacji na podaną ilość kolumn"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Szybkie oczyszczenie linii stanu"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Wypisanie wersji i zakończenie pracy"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Uściśla określenie granic słów"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <łańcuch>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<łańcuch>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Jakie jeszcze znaki mogą występować w słowach"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nazwa>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nazwa>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Użycie zadanej definicji składni do podświetlania"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Podział wiersza na białych znakach pod czas zawijania"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Bez przewijania długich linii"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Stałe pokazywanie położenia kursora"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Pokaż kursor w przeglądarce plików"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Wyświetla ten tekst pomocy i wychodzi"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Automatyczne wcięcia nowych linii"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Wycina od kursora do końca linii"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Pokaż numery linii przed tekstem"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Włączenie myszy"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Bez odczytu pliku (tylko zapis)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Ustawienie katalogu pracy"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachowanie działania klawiszy XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#kol>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kol>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Ustawia granice przewijania w podanej kolumnie"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Alternatywny program sprawdzania pisowni"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatyczny zapis przy kończeniu pracy, bez pytania"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Zapisz plik w formacie Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Tryb przeglądania (tylko odczyt)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Bez przewijania długich linii"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Bez pokazywania linii pomocy"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Right zatrzymuje się na końcu słowa"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Włączenie zawieszania"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Włącza miękkie przewijanie linii"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, wersja %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s współtwórcy nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1946,330 +1966,350 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Brak nazwy pliku"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Zapisać zmodyfikowany bufor? (Odpowiedź \"Nie\" skasuje zmiany.)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Odczyt z wejścia standardowego; podaj ^D lub ^D^D żeby skończyć.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Nie można otworzyć stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Przepraszam! Nano uległ awarii. Kod: %d. Proszę o zgłoszenie błędu.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Aby powrócić do nano, użyj \"fg\".\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Zawieszenie nie jest włączone"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "włączony(e)"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "wyłączony(e)"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Nieprzypisany klawisz"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Nie można przypisać: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Nieprzypisany klawisz: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Nie można przypisać: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Nieprzypisany klawisz: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Nieprzypisany klawisz: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Niepoprawna nazwa klucza %s"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Żądana wielkość tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Żądana pozycja łamania linii \"%s\" nie jest poprawna"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Podaj '%s -h' aby uzyskać listę dostępnych opcji.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Błędne wyrażenie regularne \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Błędy w '%s'"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Witamy w nano.  W celu otrzymania pomocy, naciśnij Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Tt"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Ww"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Tak"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nie"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Wszystko"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Błąd w %s w linii %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument %s ma niedomknięty \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Wyrażenia regularne muszą zaczynać się i kończyć znakiem \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Błędne wyrażenie regularne \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Brak nazwy składni"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Nieparzysty cudzysłów w nazwie składni"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Składnia \"none\" jest zarezerwowana"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Składnia \"default\" nie przyjmuje rozszerzeń"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Brak nazwy klawisza"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Za krótka nazwa klawisza"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Nazwa klawisza musi zaczynać się z \"^\", \"M\", lub \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Niepoprawna nazwa klucza %s"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Podaj funkcje do jakiej przypisuje się klawisz"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Nie można odwzorować nazwy \"%s\" na funkcje"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nie można odwzorować nazwy \"%s\" na menu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Brak funkcji '%s' w menu '%s'"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Przepraszam, przyciśnięcie \"%s\" nie może być przypisane ponownie"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Błąd rozszerzenia %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Kolor \"%s\" nie jest zrozumiały"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Kolor tła nie może być jaskrawy"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Polecenie '%s' wymaga poprzedniego polecenia 'syntax'"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Brak wyrażenia regularnego po poleceniu '%s'"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Puste regularne wyrażenie"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" wymaga odpowiadającego mu \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Składnia \"default\" nie przyjmuje wyrażeń regularnych '%s'"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Brak argumentu po '%s'"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument do '%s' ma niedomknięty \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Żaden klawisz nie został przywiązany do funkcji '%s' w menu '%s'. Wyjście.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Jeśli trzeba, uruchom nano z opcją -I aby dopasować ustawienia.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nie znaleziono składni \"%s\" do rozszerzenia"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Składnia \"%s\" nie ma ustawień kolorów"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku dołączonym"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Niezrozumiałe polecenie \"%s\""
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Brak opcji"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nieznana opcja \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Nie można zresetować opcji \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Opcja nie jest poprawnym łańcuchem wielobajtowym"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Wymagane są nie-białe znaki"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Wymagane są dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nie mogę znaleźć swojego katalogu domowego!  Aj!"
 
@@ -2332,237 +2372,250 @@ msgstr "To nie nawias"
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Znacznik ustawiony"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Znacznik skasowany"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Błąd podczas wywoływania \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Komentowanie nie jest obsługiwane dla tego typu plików"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Nie można komentować poza końcem linii"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nie ma nic w buforze odwołania"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "tekst dodany"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "łamanie linii"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "tekst usunięty"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "W zaznaczeniu:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "połączenie linii"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "tekst zamieniony"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Edytuj zastąpienie"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "wycięcie tekstu"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "wklejanie tekstu"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "tekst wprowadzony"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "wcięcie"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "usuń wcięcie"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "zakomentuj"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "odkomentuj"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Odwołano operację (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nic do powtórzenia!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Powtórzono operację (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Nie można utworzyć potoku"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Nie można rozwidlić procesu"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtracja"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Nie można otworzyć potoku: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Nieprawidłowy znacznik cytowania %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Można teraz cofnąć justowanie!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2606
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Wyjustuj cały plik"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Wyjustuj bieżący akapit"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Słowo nie do znalezienia: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Edytuj zastąpienie"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Nast.słowo..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Tworzenie listy błędnie napisanych słów, proszę czekać..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Nie można uzyskać wielkości bufora potoku"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Błąd podczas wywoływania \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Błąd podczas wywoływania \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Błąd podczas wywoływania \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Zakończono sprawdzanie pisowni"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Brak analizatora składni dla tego typu pliku!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Zapisać bufor przed sprawdzaniem składni?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Sprawdzanie składni, proszę zaczekać"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Otrzymano 0 poprawnych linii od polecenia: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Pierwszy komunikat"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ostatni komunikat"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sSłowa: %zu  Linii: %zd  Znaki: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "wprowadzanie dosłowne"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Brak fragmentu słowa"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Brak dalszych wyników"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Brak wyników"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano brakło pamięci!"
@@ -2590,88 +2643,135 @@ msgstr "Za dużo błędów z wejścia standardowego"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Nieznana sekwencja"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Wejście Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Zmieniony"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Przeglądanie"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Tryb zastrzeżony"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Dalsze ostrzeżenia wyciszono"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "lin. %zd/%zd (%d%%), kol. %zu/%zu (%d%%), zn. %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "wersja"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Specjalne podziękowania otrzymują:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "wielu tłumaczy i TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "oraz wszyscy pozostali, o których zapomnieliśmy..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Dziękujemy za korzystanie z nano!"
 
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Klawisz niedozwolony w trybie innym niż wielu buforów"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Odnów Tekst"
+
+#~ msgid "Unjustify"
+#~ msgstr "Cofnij just."
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Wklej zawartość schowka w bieżącej linii"
+
 #~ msgid "PrevHstory"
 #~ msgstr "Poprz.Hist"
 
 #~ msgid "NextHstory"
 #~ msgstr "Nast.Hist"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Płynne przewijanie"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Wyłącza dodanie znaku nowej linii na końcu pliku"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Użycie dodatkowej linii do redagowania"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Ustawia granice przewijania w podanej kolumnie"
+
+#~ msgid "text add"
+#~ msgstr "tekst dodany"
+
+#~ msgid "text delete"
+#~ msgstr "tekst usunięty"
+
+#~ msgid "text replace"
+#~ msgstr "tekst zamieniony"
+
+#~ msgid "text cut"
+#~ msgstr "wycięcie tekstu"
+
+#~ msgid "text uncut"
+#~ msgstr "wklejanie tekstu"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Nieprawidłowy znacznik cytowania %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Można teraz cofnąć justowanie!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Wywołanie sprawdzania pisowni, proszę zaczekać"
 
diff --git a/po/pt.po b/po/pt.po
@@ -1,14 +1,14 @@
 # Nano editor.
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018.
+# Pedro Albuquerque <palbuquerque73@gmail.com>, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-3.2-pre1\n"
+"Project-Id-Version: nano-4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-06 08:12+0000\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-12 07:42+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
 "Language: pt\n"
@@ -29,9 +29,9 @@ msgstr "Impossível abrir a pasta: %s"
 msgid "Go To Directory"
 msgstr "Ir para a pasta"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -46,9 +46,9 @@ msgstr "Impossível sair de %s"
 msgid "Can't move up a directory"
 msgstr "Impossível subir uma pasta"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro ao ler %s: %s"
@@ -94,17 +94,17 @@ msgstr "Esta é a única ocorrência"
 msgid "No current search pattern"
 msgstr "Sem padrão de procura actual"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nome de sintaxe desconhecido: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() falhou: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) falhou: %s"
@@ -198,7 +198,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu linha (%s)"
 msgstr[1] "%s -- %zu linhas (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Novo buffer"
 
@@ -302,788 +302,786 @@ msgstr "Ficheiro a inserir sem conversão [de %s]"
 msgid "File to insert [from %s]"
 msgstr "Ficheiro a inserir [de %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Pasta de operação inválida\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Pasta de operação inválida: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Falha ao gravar segurança; continuar gravação (N se não tiver certeza)?"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Pasta de segurança inválida\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Pasta de segurança inválida: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossível escrever fora de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro ao escrever segurança %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Muitas seguranças?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o ficheiro temporário: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu linha escrita"
 msgstr[1] "%zu linhas escritas"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Segurança]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Prepor selecção ao ficheiro"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Acrescentar selecção ao ficheiro"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Escrever selecção no ficheiro"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nome do ficheiro onde prepor"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nome do ficheiro onde acrescentar"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nome do ficheiro onde escrever"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Muito pequeno"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Ficheiro existe -- impossível sobrescrever"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Gravar com um NOME DIFERENTE? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "\"%s\" já existe; SOBRESCREVER? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Ficheiro alterado no disco"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "O ficheiro foi alterado desde que o abriu; continuar a gravar? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mais)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Sair"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Fechar"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Repor txt"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Separar"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cancelar a função actual"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Abre este texto de ajuda"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Fechar o buffer actual/Sair do nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Gravar o buffer actual (ou região marcada) no disco"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Inserir outro ficheiro no buffer actual( ou em novo buffer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Procurar para a frente por cadeia ou expressão regular"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Procurar para trás por cadeia ou expressão regular"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Procurar cadeia para a frente"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Procurar cadeia para trás"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Actualiza a lista de ficheiros"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Ir para a coluna esquerda"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Ir para a coluna direita"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Ir para a primeira linha nesta coluna"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Ir para a última linha nesta coluna"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Subir um ecrã"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Descer um ecrã"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Cortar a linha actual (ou região marcada) e gravá-la no buffer de corte"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Colar da memória na linha actual"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Colar o conteúdo do buffer de corte na posição do cursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Mostrar a posição do cursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Abrir verificador ortográfico, se disponível"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Substituir cadeia ou expressão regular"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Ir para linha e coluna número"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto a partir da posição do cursor"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Copiar linha actual (ou região marcada) e gravar no buffer-de-corte"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Atirar linha actual fora (ou região marcada)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Indentar linha actual (ou linhas marcadas)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Recuar linha actual (ou linhas marcadas)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Desfazer última operação"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Refazer última operação desfeita"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Recuar um carácter"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avançar um carácter"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Recuar uma palavra"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avançar uma palavra"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Ir para linha anterior"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Ir para linha seguinte"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Ir para o início da linha actual"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Ir para o fim da linha actual"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Ir para bloco de texto anterior"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Ir para bloco de texto seguinte"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Ir para o início do parágrafo; e depois, do parágrafo anterior"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Ir para o fim do parágrafo; e depois, do parágrafo seguinte"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Ir para a primeira linha do ficheiro"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Ir para a última linha do ficheiro"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Ir para parênteses-irmão"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rolar uma linha acima sem mover o cursor textualmente"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rolar uma linha abaixo sem mover o cursor textualmente"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Mudar para buffer de ficheiro anterior"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Mudar para buffer de ficheiro seguinte"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserir tecla seguinte literalmente"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir tabulação na posição do cursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir nova linha na posição do cursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Elimina o carácter sob o cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina o carácter à esquerda do cursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Cortar do cursor até o início da palavra"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Eliminar do cursor até o início da palavra"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Cortar do cursor até ao início da palavra seguinte"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Eliminar do cursor até ao início da palavra seguinte"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cortar do cursor até o fim da linha"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justificar parágrafo actual"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justificar todo o ficheiro"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Contar número de palavras, linhas e caracteres"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualizar (re-desenha) o ecrã actual"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspende o editor (se a suspensão estiver activa)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Tentar completar a palavra actual"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Mostrar/Ocultar nota da linha actual (ou linhas marcadas)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Gravar ficheiro sem perguntar"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Procura a ocorrência para trás"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Procura a ocorrência para a frente"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Iniciar/Parar gravação de macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Executar a última macro gravada"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Activa sensibilidade a maiúsculas na procura"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inverter direcção da procura"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Activar o uso de expressões regulares"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Relembrar a procura/substituição anterior"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Relembrar a procura/substituição seguinte"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Activar o uso do formato DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Activar o uso do formato Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Alternar acrescentar"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Activar prepor"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Alternar segurança do ficheiro original"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Encaminhar o buffer actual (ou região marcada) para o comando"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Não converter do formato DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Alternar o uso de um novo buffer"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Fechar buffer sem gravar"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Abrir explorador"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Fechar explorador"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Ir para o primeiro ficheiro na lista"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Ir para o último ficheiro na lista"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Ir para o ficheiro anterior na lista"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Ir para o ficheiro seguinte na lista"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Ir para pasta"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Chamar limpeza, se disponível"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Mensagem de limpeza anterior"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Mensagem de limpeza seguinte"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ajuda"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Gravar"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Carregar"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justificar"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Procurar"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Ir p/ pasta"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Cortar txt"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Colar texto"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortografia"
 
 # Tem 12 espaços disponíveis
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos cursor"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ir p/ linha"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marcar txt"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copiar txt"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Sens Maiúscl"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "ExpReg"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Reverso"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Não subst"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "+ antiga"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "+ recente"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Unir tudo"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Parênteses"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Gravar"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Onde estava?"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Seguinte"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Recuar"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Avançar"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Palvr ant"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Palvr seg"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Início"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Linha ant"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Linha seg"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rolar acima"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rolar abaixo"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloco ant"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloco seg"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "In. parág"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fim parág"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pág anterior"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Pág seguinte"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Prim. lin"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Últ. lin"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Fich ant"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fich seg"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Cort esq"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Cortar esq"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Cort dir"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Cortar dir"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Cort fim"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Tot palavras"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Literal"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Indentar"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "De-indentar"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Comentar linhas"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completar"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Gravar macro"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Executar macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Apagar txt"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Limpar"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Gravar"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ir para txt"
@@ -1163,59 +1161,59 @@ msgstr "Msg limpeza seg"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Modo ajuda"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Mostra posição do cursor constante"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Rolamento suave"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Rola blocos (por meio ecrã)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ajuste suave de linhas compridas"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Mostrar espaços vazios"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Realce de sintaxe por cor"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tecla Home inteligente"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Indentação automática"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Cortar até ao fim"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Ajuste rígido de linhas compridas"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações em espaços"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Suporte ao rato"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspensão"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Números de linha"
 
@@ -1581,19 +1579,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Erro ao escrever %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "A tecla é inválida no modo de exibição"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Esta função está desactivada no modo restrito"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Ajuda não disponível"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1602,7 +1600,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1611,7 +1609,7 @@ msgstr ""
 "\n"
 "Buffer não escrito em %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1620,7 +1618,7 @@ msgstr ""
 "\n"
 "Buffer não escrito: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1631,7 +1629,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1642,7 +1640,7 @@ msgstr ""
 "com um \"+\" antes do nome do ficheiro. Pode pôr o nº de coluna após uma "
 "vírgula.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1651,281 +1649,293 @@ msgstr ""
 "Quando um nome de ficheiro é \"-\", o Nano lê dados da entrada padrão.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opção\t\tOpção GNU longa\t\tSignificado\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Activa a tecla Home inteligente"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Gravar seguranças de ficheiros existentes"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <pasta>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<pst>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Pasta para gravar seguranças únicas"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Usa negrito em vez de texto reverso"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Converte tabulações digitadas em espaços"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Lê sempre o ficheiro para novo buffer"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Usa ficheiros-travão (estilo vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Grava/Lê hist. das procuras/substituições"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Não ler o ficheiro nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Mostra um barra-guia nesta coluna"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrige confusão com o teclado numérico"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Não apôr nova-linha ao fim dos ficheiros"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Não adicionar nova linha automática (predefinição)"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Aparar espaços finais em quebra rígida"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Não converte ficheiros do formato DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Usa uma ou mais linhas para edição"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Grava/Lê localização da posição do cursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Expressão regular para corresponder à citação"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Modo restrito"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Rola linhas em vez de meio ecrã"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <numcols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<numcols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Define tamanho da tabulação para numcols"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Limpeza rápida da barra de estado"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Imprime informação de versão e sai"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detecta melhor os limites das palavras"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <cadeia>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<cadeia>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Quais caracteres são partes da palavra"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nome>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nome>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definição de sintaxe para uso de cores"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Bksp e Del apagam uma região marcada"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "No ajuste suave, fazê-lo em espaço vazio"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ajuste rígido automático em linhas longas"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Mostra sempre a posição do cursor"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige confusão entre Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Manter a linha abaixo do título vazia"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Garantir que o texto acaba com nova linha"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Mostra o cursor no explorador & texto de ajuda"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Mostra este texto de ajuda e sai"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indentação automática em novas linhas"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Rolar meio ecrã, não uma linha"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Cortar do cursor até o fim da linha"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Mostra números de linha à frente do texto"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Activa o uso do rato"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Não lê o ficheiro (só o escreve)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <pasta>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<pasta>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Define a pasta de trabalho"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva as teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <numcols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<numcols>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Define o ajuste rígido na coluna numcols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Ajustar largura para ajuste rígido e justificar"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Activa outro verificador ortográfico"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Gravação automática ao sair, sem perguntar"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Gravação Unix predefinida dos ficheiros"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Modo de leitura (só de leitura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Sem ajuste rígido em linhas compridas"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Sem ajuste rígido em linhas longas (predefinição)"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Não mostra as duas linhas de ajuda"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Direita para no fim das palavras"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Permite suspensão"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Activa ajuste suave de linhas compridas"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versão %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s os contribuidores do nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1934,329 +1944,348 @@ msgstr ""
 "\n"
 " Opções compiladas:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Sem nome de ficheiro"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Gravar buffer modificado (responder \"Não\" vai DESCARTAR alterações.)?"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "A ler da entrada padrão; digite ^D ou ^D^D para terminar.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Falha ao abrir stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossível reabrir stdin do teclado, desculpe\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebido SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "O Nano rebentou!  Código: %d. Por favor, reporte o erro.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Use \"fg\" para retornar ao Nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspensão não activada"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "activada"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "desactivada"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tecla não vinculada"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tecla não vinculável: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tecla não vinculada: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Tecla não-vinculável: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tecla não vinculada: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tecla não vinculada: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Coluna-guia \"%s\" é inválido"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Opção %s ignorada; é a predefinição\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Regex errada \"%s\": %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Número de linha ou coluna inválido"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Erros em \"%s\""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Boas vindas ao Nano... Para ajuda básica digite Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnNn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Não"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Todos"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Erro em %s na linha %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento \"%s\" tem indeterminado \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expreg deve começar e terminar com um carácter \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expreg errada \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Aspas sem par no nome da sintaxe"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "A sintaxe \"default\" não aceita extensões"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Falta o nome da tecla"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Nome da tecla muito curto"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Nome da tecla deve começar com \"^\", \"M\" ou \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "O nome de tecla \"%s\" é inválido"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Tem de especificar uma função para vincular a tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossível mapear o nome \"%s\" a uma função"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossível mapear o nome \"%s\" a um menu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Não pode redefinir o vínculo da sequência \"%s\""
+msgid "Keystroke %s may not be rebound"
+msgstr "Não pode re-vincular a sequência %s"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro ao expandir %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Cor \"%s\" não compreendida"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Uma cor de fundo não pode ser clara"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Um comando \"%s\" requer um comando \"syntax\" precedente"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Falta a expressão regular após o comando \"%s\""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Expressão regular vazia"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa de um \"end=\" correspondente"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "A sintaxe \"default\" não aceita expressões regulares \"%s\""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Falta o argumento após \"%s\""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Faltam \" de fecho no argumento de \"%s\""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Nenhuma tecla associada à função \"%s\" no menu \"%s\". A sair.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Se necessário, use o Nano -I para ajustar as definições no nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Impossível localizar a sintaxe \"%s\" para estender"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não tem comandos de cor"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" não é permitido no ficheiro incluído"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Falta opção"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opção \"%s\" desconhecida"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Impossível desactivar a opção \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "O argumento não é uma cadeia multibyte válida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "São requeridos caracteres imprimíveis"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "São requeridos dois caracteres de coluna única"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Não consigo localizar a minha pasta pessoal!"
 
@@ -2318,237 +2347,245 @@ msgstr "Não é parênteses"
 msgid "No matching bracket"
 msgstr "Nenhum parênteses irmanado"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marcação feita"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marcação desfeita"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ao chamar \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Não há suporte a comentários neste tipo de ficheiro"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Impossível comentar após o fim do ficheiro"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nada a desfazer!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "adicionar txt"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "adição"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "remover txt"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "eliminação"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "unir linha"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "substituir txt"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "substituição"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "eliminação"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "cortar txt"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "cortar"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "repor txt"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "colar"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "inserir txt"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "inserção"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "indentar"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "de-indentar"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "comentar"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "descomentar"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Acção desfeita (%s)"
+msgid "Undid %s"
+msgstr "%s desfeita"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nada a refazer!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Acção refeita (%s)"
+msgid "Redid %s"
+msgstr "%s refeita"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Impossível criar pipe"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Impossível bifurcar"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "a filtrar"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Falha ao abrir pipe: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Má citação %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "justificação"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Selecção justificada"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Ficheiro justificado"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Pode agora desalinhar!"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Parágrafo justificado"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Palavra não localizável: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Palavra seguinte..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "A criar lista de palavra com erros, por favor aguarde..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Impossível obter tamanho do buffer do pipe"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Erro ao chamar \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ao chamar \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Erro ao chamar \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificação ortográfica falhou: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Verificação ortográfica concluída"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Sem limpeza definida para este tipo de ficheiro!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Gravar buffer modificado antes de limpar?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "A chamar limpeza, por favor aguarde"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Obtidas 0 linhas analisáveis do comando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Esta mensagem é para o ficheiro não-aberto %s, abri-lo num novo buffer?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Sem mensagens para este ficheiro"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Na primeira mensagem"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Na última mensagem"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%spalavras: %zu, linhas: %zd, caracteres: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Na selecção: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Sem fragmento de palavra"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Nenhuma outra ocorrência"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Sem ocorrências"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano sem memória!\n"
 
@@ -2574,79 +2611,125 @@ msgstr "Demasiados erros de stdin\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Sequência desconhecida"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrada Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "A limpar --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "PST:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Restrito"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Avisos posteriores foram suprimidos"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "linha %zd/%zd (%d%%), col %zu/%zu (%d%%), car %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "O editor de texto Nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Trazido até si por:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "os vários tradutores e o TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que esquecemos..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o Nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Repor txt"
+
+#~ msgid "Unjustify"
+#~ msgstr "Separar"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Colar da memória na linha actual"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Rolamento suave"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Não apôr nova-linha ao fim dos ficheiros"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Usa uma ou mais linhas para edição"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Define o ajuste rígido na coluna numcols"
+
+#~ msgid "text add"
+#~ msgstr "adicionar txt"
+
+#~ msgid "text delete"
+#~ msgstr "remover txt"
+
+#~ msgid "text replace"
+#~ msgstr "substituir txt"
+
+#~ msgid "text cut"
+#~ msgstr "cortar txt"
+
+#~ msgid "text uncut"
+#~ msgstr "repor txt"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Má citação %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Pode agora desalinhar!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tecla inválida em modo não-multibuffer"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -1,15 +1,15 @@
 # Brazilian Portuguese translation for the nano
 # Traduções em português brasileiro para o pacote nano
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2019 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 Fontenelle <rafaelff@gnome.org>, 2014-2018.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2014-2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-05 19:07-0200\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-11 10:21-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
 "net>\n"
@@ -31,9 +31,9 @@ msgstr "Não foi possível abrir o diretório: %s"
 msgid "Go To Directory"
 msgstr "Ir para o diretório"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -48,9 +48,9 @@ msgstr "Não sair de %s"
 msgid "Can't move up a directory"
 msgstr "Não é possível mover um diretório"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro ao ler %s: %s"
@@ -86,7 +86,7 @@ msgstr " [Retroceder]"
 
 #: src/browser.c:722 src/browser.c:727 src/search.c:285
 msgid "Search Wrapped"
-msgstr "Pesquisa ajustada"
+msgstr "Pesquisa quebrada"
 
 #: src/browser.c:738 src/search.c:418
 msgid "This is the only occurrence"
@@ -96,17 +96,17 @@ msgstr "Esta é a única ocorrência"
 msgid "No current search pattern"
 msgstr "Nenhum padrão de pesquisa atualmente"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nome de sintaxe desconhecido: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() falhou: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) falhou: %s"
@@ -207,7 +207,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu linha (%s)"
 msgstr[1] "%s -- %zu linhas (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Novo buffer"
 
@@ -311,793 +311,791 @@ msgstr "Arquivo para inserção não convertido [de %s]"
 msgid "File to insert [from %s]"
 msgstr "Arquivo para inserção [de %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Diretório de operação inválido\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Diretório de operação inválido: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
-msgstr "Diretório reserva inválido\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Diretório reserva inválido: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Não foi possível escrever fora de %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Muitos arquivos reserva?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Escrita %zu linha"
 msgstr[1] "Escritas %zu linhas"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Arq reserva]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Pré-adicionar seleção para o arquivo"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Adicionar seleção para o arquivo"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Escrever a seleção para o arquivo"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Nome arquivo para pré-adicionar"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Nome do arquivo para adicionar a"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Nome do arquivo para gravar"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Pequena demais"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "O arquivo existe -- não é possível sobrescrevê-lo"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Salvar o arquivo com um NOME DIFERENTE? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Arquivo \"%s\" já existe; SOBRESCREVER? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Arquivo no disco foi alterado"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "O arquivo foi modificado desde a última vez que você abriu; continuar "
 "salvamento? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mais)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Sair"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Fechar"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Colar txt"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Desjustifi"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Cancela a função atual"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Abre este texto de ajuda"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Fecha o buffer atual / Sai do nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Escreve o buffer atual (ou a região marcada) no disco"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Insere outro arquivo no buffer atual (ou em um novo buffer)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Procura para frente por um texto ou uma expressão regular"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Procura para trás por um texto ou uma expressão regular"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Pesquisa para frente por um texto"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Pesquisa para trás por um texto"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Atualiza a lista de arquivos"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Vai para a coluna da esquerda"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Vai para a coluna da direita"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Vai para a primeira linha nesta coluna"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Vai para a última linha nesta coluna"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Vai uma tela acima"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Vai uma tela abaixo"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Recorta a linha atual (ou região marcada) e guarda-a no buffer-de-"
 "transferência"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Cola do buffer-de-transferência para a linha atual"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Cola o conteúdo do buffer-de-transferência na posição do cursor"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Mostra a posição do cursor"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Chama o verificador ortográfico, se disponível"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Substitui um texto ou expressão regular"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Vai para linha e coluna número"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marca o texto iniciando na posição do cursor"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Copia a linha atual (ou região marcada) e guarda-a no buffer-de-transferência"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Descarta a linha atual (ou região marcada)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Recua a linha atual (ou linhas marcadas)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Remove recuo da linha atual (ou linhas marcadas)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Desfaz a última operação"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Refaz a última operação desfeita"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Volta em um caractere"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avança em um caractere"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Retrocede em uma palavra"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avança em uma palavra"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Vai para a anterior linha"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Vai para a próxima linha"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Vai para o início da linha atual"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Vai para o fim da linha atual"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Vai para o bloco de texto anterior"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Vai para a próximo bloco de texto"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Vai para o início do parágrafo; depois para o parágrafo anterior"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Vai para o fim do parágrafo; depois para o próximo parágrafo"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Vai para a primeira linha do arquivo"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Vai para a última linha do arquivo"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Vai para o fechamento do parênteses/colchetes/chaves"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rola uma linha acima sem mover o cursor textualmente"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rola uma linha abaixo sem mover o cursor textualmente"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Troca para o buffer de arquivo anterior"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Troca para o próximo buffer de arquivo"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Insere caractere(s) literalmente"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Insere um caractere tabular na posição do cursor"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Insere quebra de linha na posição do cursor"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Apaga o caractere sob o cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Apaga o caractere a esquerda do cursor"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Recorta para trás do cursor até o início da palavra"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Exclui para trás do cursor até o início da palavra"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Recorta para frente do cursor até início da próxima palavra"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Exclui para frente do cursor até início da próxima palavra"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Recorta do cursor até o fim da linha"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justifica o parágrafo atual"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justifica o arquivo inteiro"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta o número de palavras, linhas e caracteres"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Atualiza (re-desenha) a tela atual"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspende o editor (se a suspensão estiver habilitada)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Tenta e completa a palavra atual"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Comenta/descomenta a linha atual (ou linhas marcadas)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Salva o arquivo sem perguntar"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Pesquisa a ocorrência anterior"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Pesquisa a próxima ocorrência"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Inicia/para gravação de um macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Executa a última macro gravada"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ativa sensibilidade de caixa na pesquisa"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inverte a direção da pesquisa"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Ativa o uso de expressões regulares"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Lembra o último texto de pesquisa/substituição"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Lembra o ultimo texto de pesquisa/substituição"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Ativa o uso do formato DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Ativa o uso do formato Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Ativa ajuntamento"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Ativa pré-adicionamento"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Ativa cópia de segurança do arquivo original"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Executa um comando externo"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Pipe no buffer atual (ou a região marcada) para o comando"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Não converte do formato DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Ativa o uso de um novo buffer"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Fecha o buffer sem salvá-lo"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Vai para o navegador de arquivo"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Sai do navegador de arquivos"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Vai para o primeiro arquivo na lista"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Vai para o último arquivo na lista"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Vai para o arquivo anterior na lista"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Vai para o próximo arquivo na lista"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Vai para o diretório"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Chama o lintador, se disponível"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Vai para a mensagem anterior do lintador"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Vai para a próxima mensagem do lintador"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ajuda"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Gravar"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Ler o arq"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justificar"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Atualiz"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Onde está?"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Substituir"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Ir p/ dir"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Recort txt"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Colar txt"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "VerfOrtog"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Pos atual"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Ir p/ linha"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marcar txt"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copiar txt"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Sens de caixa"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Exp regular"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Contrário"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Sem substituição"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Mais antigo"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Mais novo"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "JstifiCmpl"
 
-# Aplica parênteses no texto
-#: src/global.c:837
+# Aplica parênteses no texto -- Rafael
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Parênteses"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Salvar"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Onde estava?"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Próxima"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Voltar"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Avançar"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Palvr ant"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Prx palvr"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Linha ant"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Prox linha"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloco ant"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Prx bloco"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Ini de par"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Fim de par"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pág anter"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Próx pág"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Prim linha"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Últ linha"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Próximo arquivo"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Arquivo anterior"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Excluir"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Recort Esq"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Excluir à esquerda"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Recort Dir"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Excluir à direita"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "RecortarAtéOFim"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Entrada literal"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Recuo"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Tirar recuo"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Comentar linhas"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Completar"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Gravar"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Executar macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Apagar texto"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Lintar"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Salvar"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Ir para o próximo"
@@ -1177,59 +1175,59 @@ msgstr "Próx Msg Lint"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Modo ajuda"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Mostra da posição do cursor constante"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Rolagem suave"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Rolagem pulada (a cada metade de tela)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
-msgstr "Ajuste suave de linhas compridas"
+msgstr "Quebra suave de linhas compridas"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Mostra espaços vazios"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Marcação colorida de sintaxe"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tecla Home inteligente"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Recuo automática"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Recorta até o fim"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
-msgstr "Ajuste rígido de linhas compridas"
+msgstr "Quebra rígida de linhas compridas"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações para espaços"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Suporte ao mouse"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspensão"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numeração de linha"
 
@@ -1608,19 +1606,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Erro ao escrever %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "A tecla é inválida no modo de visualização"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Esta função está desabilitada no modo restrito"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Ajuda não está disponível"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1629,7 +1627,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1638,7 +1636,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito em %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1647,7 +1645,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1658,7 +1656,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1668,7 +1666,7 @@ msgstr ""
 "coloque o número da linha com um \"+\" antes do nome do arquivo.\n"
 "O número da coluna pode ser adicionar após uma vírgula.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1677,284 +1675,293 @@ msgstr ""
 "Quando um nome de arquivo é \"-\", nano lê dados da entrada padrão.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opção\t\tOpção GNU longa\t\tSignificado\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Habilita tecla Home inteligente"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Salva cópias reserva de arquivos que existem"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-E <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Diretório para salvar arquivos únicos de reserva"
 
-# É necessário melhorar aqui.
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
-msgstr "Usa negrito ao invés de texto em video inverso"
+msgstr "Usa negrito ao invés de texto de video inverso"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Converte tabulações digitadas em espaços"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Lê um arquivo em um novo buffer por padrão"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Usa arquivos de travas (estilo vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Grava & lê histórico das strings de pesquisa/substituição"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Não olha o arquivo nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Mostra uma barra guia nesta coluna"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrige confusão com o teclado numérico"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Não adiciona nova-linha ao final das linhas dos arquivos"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Não adiciona uma nova linha automaticamente [padrão]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
-msgstr "Apara espaços ao final fazer ajuste rígido"
+msgstr "Apara espaços no final ao fazer quebra de linha rígida"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Não converte arquivos do formato DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Utiliza um ou mais linhas para edição"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Registra & lê a localização da posição do cursor"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Expressão regular para corresponder à citação"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Modo restrito"
 
-# revisar: meia tela
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Rola linhas ao invés de meia tela"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Modifica o tamanho da tabulação para #cols"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Remoção rápida da barra de status"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Imprime informação de versão e fecha"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detecção mais precisa dos limites das palavras"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Quais caracteres são partes da palavra"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nome>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nome>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definição de sintaxe para inserção de cores"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Deixa Bsp e Del apagar uma região marcada"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
-msgstr "Ao fazer ajuste suave, o faz em espaço em branco"
+msgstr "Ao fazer quebra de linha suave, o faz em espaço em branco"
+
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Ajuste rígido automático de linhas compridas"
 
-#: src/nano.c:851
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Mostra a posição do cursor constantemente"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige confusão entre Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Mantém a linha abaixo do título vazio"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Garante que o texto termina com uma ova linha"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Mostra o cursor no navegador de arquivo & texto de ajuda"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Mostra esse texto de ajuda e sai"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Avança o recuo automaticamente em nova linhas"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Rolagem a cada metade de tela, e não linha"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Recorta do cursor até o fim da linha"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Mostra números de linhas na frente do texto"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Habilita o uso do mouse"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Não lê o arquivo (apenas o escreve)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Define o diretório de trabalho"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva as teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#colun>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colun>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Define o ponto de ajuste rígido na coluna #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Define a largura do ajuste rígido e do texto justificado"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Habilita um verificador ortográfico alternativo"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Salva automaticamente ao sair, sem perguntar"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Salva um arquivo por padrão no formato Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Modo visualização (somente leitura)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Não faz ajuste rígido em linhas compridas"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Não faz ajuste rígido em linhas compridas [padrão]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Não mostra as duas linhas de ajuda"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Faz Ctrl+Right parar nos finais das palavras"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Permite suspensão"
 
-# Soft line wrapping?
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
-msgstr "Habilita ajuste suave de linhas compridas"
+msgstr "Habilita quebra suave de linhas compridas"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versão %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s os contribuidores do nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1963,272 +1970,291 @@ msgstr ""
 "\n"
 " Opções compiladas:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Nenhum nome de arquivo"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Salvar buffer modificado? (Responder \"Não\" vai DESCARTAR alterações.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Lendo da entrada padrão; digite ^D ou ^D^D para finalizar.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Falha ao abrir a entrada padrão: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Não foi possível reabrir a entrada padrão do teclado, desculpe\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Desculpe! Nano travou!  Código: %d.  Por favor, relate o erro.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilize \"fg\" para retornar ao nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspensão não está habilitada"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tecla não vinculada"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tecla não vinculável: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tecla não vinculada: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Tecla não vinculável: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tecla não vinculada: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tecla não vinculada: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "A coluna guia \"%s\" é inválido"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "A opção %s foi ignorada; ela é o padrão\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Expressão regular com aspas errôneas \"%s\": %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Erros em \"%s\""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Bem-vindo ao nano. Para uma ajuda básica, digite Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Não"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Todos"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Erro no %s na linha %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expressão regular deve começar e terminar com um caractere \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expressão regular errônea \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Aspas não pareadas no nome da sintaxe"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "A sintaxe \"default\" não aceita extensões"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Falta o nome da chave"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Nome da tecla é muito curta"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Nome da tecla deve começar com \"^\", \"M\" ou \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "O nome de chave \"%s\" é inválido"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "É preciso especificar uma função para o vínculo da tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Não foi possível mapear o nome \"%s\" a uma função"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Não foi possível mapear o nome \"%s\" a um menu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Desculpe, a sequência \"%s\" ter seu vínculo redefinido"
+msgid "Keystroke %s may not be rebound"
+msgstr "A sequência %s não pode ter seu vínculo redefinido"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro ao expandir %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Cor \"%s\" não compreendida"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Uma cor de plano de fundo não pode ser clara"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Um comando \"%s\" requer um comando \"syntax\" anterior"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Faltando texto de expressão regular após o comando \"%s\""
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Texto de expressão regular vazio"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa de um \"end=\" correspondente"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "A sintaxe \"default\" não aceita expressões regulares \"%s\""
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Faltando um argumento após \"%s\""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argumento de \"%s\" falta \" de fechamento"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Nenhuma tecla está vinculada à função \"%s\" no menu \"%s\". Saindo.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2236,59 +2262,58 @@ msgstr ""
 "Se necessário, use nano com a opção -I para ajustar suas configurações no "
 "nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, 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:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" não é permitido no arquivo incluído"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Falta opção"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opção \"%s\" desconhecida"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Não é possível desativar a opção \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "O argumento não é uma string multibyte válida"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
-# Tradução para single-column?
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Dois caracteres de coluna única são necessários"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Não consigo localizar o meu diretório pessoal! Putz!"
 
@@ -2350,238 +2375,245 @@ msgstr "Não é um parênteses"
 msgid "No matching bracket"
 msgstr "Nenhum parênteses encontrado"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marcação feita"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marcação desativada"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ao chamar o \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Não há suporte a comentar neste tipo de arquivo"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Não é possível comentar após o fim do arquivo"
 
-# revisão: como traduzir undo buffer? 'desfazer' como um adjetivo?
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "adic txt"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "adição"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "remover txt"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "exclusão"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "juntar linha"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "substituir txt"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "substituição"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "apagamento"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "recortar txt"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "recorte"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "colar txt"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "colagem"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "inserir txt"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "inserção"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "recuo"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "tirar recuo"
+msgstr "reitarada de recuo"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
-msgstr "comentar"
+msgstr "comentário"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
-msgstr "descomentar"
+msgstr "retirada de comentário"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Ação desfeita (%s)"
+msgid "Undid %s"
+msgstr "Desfeita a ação %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nada para refazer!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Ação repetida (%s)"
+msgid "Redid %s"
+msgstr "Refeita a ação %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Não foi possível criar o pipe"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Não foi possível bifurcar"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtragem"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Falha ao abrir o pipe: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "String de citação ruim %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "jusitificação"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Seleção justificada"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Arquivo justificado"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "É possível DesJustificar!"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Parágrafo justificado"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Palavra não localizável: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Próxima palavra..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Não foi possível descobrir o tamanho do buffer de pipe"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Erro ao chamar o \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ao chamar o \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Erro ao chamar o \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificação ortográfica falhou: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Verificação ortográfica finalizada"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Nenhum lintador definido para este tipo de arquivo!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Salvar o buffer modificado antes de lintar?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Chamando lintador, por favor espere"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Obteve 0 linhas analisáveis a partir do comando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Nenhuma mensagem para esse arquivo"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Na primeira mensagem"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Na última mensagem"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sPalav: %zu  Linhs: %zd  Carac: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Nenhum fragmento de palavra"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Nenhuma outra ocorrência"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Nenhuma ocorrência"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano está sem memória!\n"
 
@@ -2607,79 +2639,125 @@ msgstr "Número excessivo de erros da entrada padrão\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Sequência desconhecida"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Entrada Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Lintagem --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Olhar"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Restrito"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Avisos posteriores foram suprimidos"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "lin %zd/%zd (%d%%), col %zu/%zu (%d%%), carac %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Trazido para você por:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "A Fundação Software Livre"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "os vários tradutores e o TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que nós esquecemos..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Colar txt"
+
+#~ msgid "Unjustify"
+#~ msgstr "Desjustifi"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Cola do buffer-de-transferência para a linha atual"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Rolagem suave"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Não adiciona nova-linha ao final das linhas dos arquivos"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Utiliza um ou mais linhas para edição"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Define o ponto de quebra de linha rígido na coluna #cols"
+
+#~ msgid "text add"
+#~ msgstr "adic txt"
+
+#~ msgid "text delete"
+#~ msgstr "remover txt"
+
+#~ msgid "text replace"
+#~ msgstr "substituir txt"
+
+#~ msgid "text cut"
+#~ msgstr "recortar txt"
+
+#~ msgid "text uncut"
+#~ msgstr "colar txt"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "String de citação ruim %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "É possível DesJustificar!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tecla inválida em modo não-multibuffer"
 
@@ -2926,4 +3004,4 @@ msgstr "Obrigado por usar o nano!"
 #~ msgstr "Encontrar Outro parênteses"
 
 #~ msgid "Long line wrapping"
-#~ msgstr "Ajuste de linhas longas"
+#~ msgstr "Querba de linhas compridas"
diff --git a/po/ro.po b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.2-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-11-10 12:58+0200\n"
 "Last-Translator: Mihai Cristescu <mihai.cristescu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -34,9 +34,9 @@ msgstr "Nu se poate deschide directorul: %s"
 msgid "Go To Directory"
 msgstr "Mergi la director"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "S-a renunțat"
 
@@ -51,9 +51,9 @@ msgstr "Nu se poate deplasa în afara %s"
 msgid "Can't move up a directory"
 msgstr "Nu se poate schimba mai sus directorul"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eroare la citirea %s: %s"
@@ -99,17 +99,17 @@ msgstr "Aceasta este singura apariție"
 msgid "No current search pattern"
 msgstr "Nici un termen de căutare definit"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Nume necunoscut sintaxă: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() a eșuat: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) a eșuat: %s"
@@ -207,7 +207,7 @@ msgstr[0] "%s — %zu linie (%s)"
 msgstr[1] "%s — %zu linii (%s)"
 msgstr[2] "%s — %zu de linii (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Spațiu nou"
 
@@ -316,48 +316,50 @@ msgstr "Fișier de inserat neconvertit [din %s]"
 msgid "File to insert [from %s]"
 msgstr "Fișier de inserat [din %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Director de operare nevalid\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Scrierea copiei de rezervă a eșuat; se continuă salvarea? (Tastați N dacă "
 "sunteți nesigur) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Director pentru copii de rezervă nevalid\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nu se poate scrie în afara %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eroare la scrierea copiei de rezervă %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Prea multe copii de rezervă?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eroare la scrierea fișierului temporar: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eroare la scrierea %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -365,748 +367,750 @@ msgstr[0] "S-a scris %zu rând"
 msgstr[1] "S-au scris %zu rânduri"
 msgstr[2] "S-au scris %zu de rânduri"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Copie de rezervă]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Adaugă selecție la începutul fișierului"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Adaugă selecție la fișier"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Scrie selecție în fișier"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Numele fișierului la începutul căruia se adaugă"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Numele fișierului la sfârșitul căruia se adaugă"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Numele fișierului pentru scriere"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Prea mic"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Fișierul există — nu se poate suprascrie"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Se salvează fișierul cu un NUME DIFERIT? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Fișierul „%s” există, SE SUPRASCRIE ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Fișierul de pe disc s-a schimbat"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Fișierul a fost modificat de când a fost deschis, se continuă salvarea? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mai mult)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Închide"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Lipește"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Anul. alin."
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Anulează funcția curentă"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Afișează acest text de ajutor"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Închide spațiul curent / Ieșire din nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Scrie spațiul curent (sau regiunea marcată) pe disc"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Inserează alt fișier în spațiul curent (sau într-un spațiu nou)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Caută înainte un text sau o expresie regulată"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Caută înapoi un text sau o expresie regulată"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Caută înainte un text"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Caută înapoi un text"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Reîmprospătează lista de fișiere"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Sari la coloana de pe stânga"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Sari la coloana de pe dreapta"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Sari la primul rând în această coloană"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Sari la ultimul rând în această coloană"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Deplasează cursorul în sus cu un ecran"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Deplasează cursorul în jos cu un ecran"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Decupează rândul curent (sau regiunea marcată) și salvează-l în memoria "
 "temporară"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Lipește din memoria temporară în rândul curent"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Inserează un tab la poziția cursorului"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Afișează poziția cursorului"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Lansează corectorul ortografic, dacă este disponibil"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Înlocuiește un text sau o expresie regulată"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Sari la rândul și coloana numărul"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Marchează începutul textului de la poziția cursorului"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Copiază rândul curent (sau regiunea marcată) și salvează-l în memoria "
 "temporară"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Renunță la rândul curent (sau regiunea marcată)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Identează rândul curent (sau rândurile marcate)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Deidentează rândul curent (sau rândurile marcate)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Anulează ultima operație"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Repetă ultima operație anulată"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Înapoi cu un caracter"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Avansează cu un caracter"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Înapoi cu un cuvânt"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Avansează cu un cuvânt"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Sari la rândul anterior"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Sari la rândul următor"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Sari la începutul rândului curent"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Sari la sfârșitul rândului curent"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Sari la blocul de test anterior"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Sari la blocul de text următor"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Deplasează cursorul la începutul paragrafului; apoi la începutul "
 "paragrafului anterior"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Deplasează cursorul dincolo de sfârșitul paragrafului; apoi la sfârșitul "
 "paragrafului următor"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Sari la primul rând din fișier"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Sari la ultimul rând din fișier"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Sari la paranteza pereche"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Derulează în sus un rând fără a deplasa textual cursorul"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Derulează în jos un rând fără a deplasa textual cursorul"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Comută la spațiul fișier anterior"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Comută la următorul spațiu fișier"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserează următoarea apăsare de tastă verbatim"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Inserează un tab la poziția cursorului"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Inserează un rând nou la poziția cursorului"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Șterge caracterul de sub cursor"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Șterge caracterul de la stânga cursorului"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Decupează înapoi de la cursor până la începutul cuvântului"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Decupează înainte de la cursor până la următorul început de cuvânt"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Decupează de la cursor până la sfârșitul fișierului"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Aliniază paragraful curent"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Aliniază întregul fișier"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Contorizează numărul cuvintelor, rândurilor și caracterelor"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Reîmprospătează zona de ecran curentă"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Suspendă editorul (dacă suspendarea este activată)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Încercați și completați cuvântul curent"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Comentați/decomentați rândul curent (sau rândurile marcate)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Salvează fișierul fără confirmare"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Caută următoarea apariție înapoi"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Caută următoarea apariție înainte"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Pornire/Oprire înregistrare macro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Rulează ultimul macro înregistrat"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Comută sensibilitatea la majuscule a căutării"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Inversează direcția căutării"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Comută folosirea expresiilor regulate"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Reapelează șirul anterior caută/înlocuiește"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Reapelează șirul următor caută/înlocuiește"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Comută folosirea formatului DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Comuta folosirea formatului Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Comută adăugarea la sfârșit"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Comută adăugarea la început"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Comută realizarea copiei de siguranță a fișierului original"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Execută comandă externă"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Transmite spațiul curent (sau regiunea marcată) la comanda"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Nu converti fișierele din formatul DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Comută folosirea unui spațiu nou"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Închide spațiul fără a-l salva"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Mergi la navigatorul de fișiere"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Ieși din navigatorul de fișiere"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Sari la primul fișier din listă"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Sari la ultimul fișier din listă"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Sari la fișierul anterior din listă"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Sari la următorul fișier din listă"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Mergi la director"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Lansează analiza statică, dacă este disponibilă"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Sari la mesajul anterior al analizei statice"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Mergi la mesajul următor al analizei statice"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Ajutor"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Renunță"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Salvează"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Citire fiș."
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Aliniază"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Reîmprospătează"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Caută"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Înlocuiește"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Mergi la Director"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Decupează"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Transmite text"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Ortograf."
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Poz. curent."
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Sari la rând"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Anulează"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Repetă"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Marchează text"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Copiază text"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Sensibil Majusc."
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Regexp"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Înapoi"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Nicio înlocuire"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Mai vechi"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Mai noi"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Alin.compl"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Paranteză"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Salvează"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Unde era"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Precedent"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Următor"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Înapoi"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Înainte"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Cuvânt anterior"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Cuvântul următor"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Acasă"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Sfârșit"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Rândul anterior"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Rândul următor"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Derulează în sus"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Derulează în jos"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Bloc prec."
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Bloc următ."
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Început Par"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Sfârșit Par"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pagina anter."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Pagina urm."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Primul rând"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Ultimul rând"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Fișierul anterior"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Fiș urm"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Șterge înapoi"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Șterge"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Decupează Stânga"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Decupează dreapta"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Taie->Sfârșit"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Contorizare cuvinte"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Suspendă"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Indentare"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Deindentare"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Comentare rânduri"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Complet"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Înregistrare"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Rulează Macro"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Ștergere text"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Analiză statică"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Salvează"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Sari la text"
@@ -1186,59 +1190,60 @@ msgstr "Analiza urm."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Bara de ajutor"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Afișare continuă poziție cursor"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Derulare fină"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Derulare cu rânduri în loc de jumătate de ecran"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Despărțire rânduri lungi"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Afișare spațiu-alb"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Evidențiere sintaxă color"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Tastă acasă inteligentă"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Auto identare"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Decupare până la sfârșit"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Despărțire permanentă rânduri lungi"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversie a tab-urilor introduse în spații"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Funcționalitate maus"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Suspendare"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Numerotare rânduri"
 
@@ -1622,19 +1627,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Eroare la scrierea %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Tastă nevalidă în modul vizualizare"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Această funcție este dezactivată în modul restricționat"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Ajutorul nu este disponibil"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1643,7 +1648,7 @@ msgstr ""
 "\n"
 "Spațiu scris în %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1652,7 +1657,7 @@ msgstr ""
 "\n"
 "Spațiu nu s-a scris în %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1661,7 +1666,7 @@ msgstr ""
 "\n"
 "Spațiul nu s-a scris: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1672,7 +1677,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1683,7 +1688,7 @@ msgstr ""
 "un \"+\" înainte de numele fişierului. Numărul de coloane poate fi adăugat "
 "după o virgulă.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1692,281 +1697,296 @@ msgstr ""
 "Când numele fișierului este „-”, nano citeste date de la intrarea standard.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opțiune\t\tOpțiune lungă GNU\t\tSemnificație\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Activează tasta acasă inteligentă"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Salvează copii de rezervă ale fișierelor existente"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Director pentru salvarea fișierelor unice copiid de rezervă"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Folosește bold în loc de textul video inversat"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Convertește tab-urile introduse în spații"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Citește un fișier într-un spațiu nou în mod implicit"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Folosește fișiere de blocare în stilul vim"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Scrie în jurnal și citește istoria șirurilor de căutare/înlocuire"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Nu te uita la fișierele nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Sari la primul rând în această coloană"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Rezolvă problema de confuzie a tastelor numerice"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Nu se adaugă rânduri noi la sfârșitul fișierelor"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Elimină spațiile de capăt atunci când se despart permanent rândurile"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nu converti fișierele din formatul DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Se folosește încă un rând pentru editare"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Scrie în jurnal & citește locația poziției cursorului"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Expresie regulată pentru a găsi citări"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Mod restricționat"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Derulare cu rânduri în loc de jumătate de ecran"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#coloană>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#număr>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Setează lungimea unui tab la #număr coloane"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Realizează o clipire rapidă a barei de stare"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Afișează informații despre versiune și termină"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Detectează limitele cuvântului mai exact"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Care celelalte caractere sunt părți de cuvânt"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <nume>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<nume>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Definiția sintaxei de folosit pentru colorare"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Permiteți Bsp și Del să șteargă o regiune marcată"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Când se despart rândurile, se face la spațiile albe"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Nu rupe permanent rândurile lungi"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Arată continuu poziția cursorului"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Repară confuzia cu tastele Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Arată cursor în navigatorul de fișiere & textul de ajutor"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Arată acest text de ajutor și termină"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Indentează automat rândurile noi"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Decupează de la cursor până la sfârșitul rândului"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Arată numărul rândului în fața textului"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Activează folosirea mouse-ului"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Nu citi fișierul (doar scrie-l)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Setează directorul de operare"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservă tastele XON (^Q) și XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#coloană>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#număr>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Setează punctul de rupere permanentă la coloana #număr"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Activează corectorul ortografic alternativ"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvează automat la ieșire, nu întreba"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Salvează un fișier în mod implicit în format Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Mod vizualizare (doar citire)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Nu rupe permanent rândurile lungi"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Nu arăta cele două rânduri de ajutor"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Face Ctrl+Dreapta să se oprească la sfârșitul cuvintelor"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Activează suspendarea"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Activează despărțirea rândului"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, versiunea %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s colaboratorii la nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1975,274 +1995,294 @@ msgstr ""
 "\n"
 " Opțiuni compilate:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Nici un nume de fișier"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Se salvează spațiul modificat? (Răspunsul „Nu” va ANULA schimbările.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 "Se citește de la intrarea standard; scrieți ^D sau ^D^D pentru a finaliza.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Deschiderea stdin a eșuat: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Nu s-a putut redeschide stdin din tastatură, ne pare rău\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Am recepționat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Ne pare rău! Nano s-a întrerupt! Cod: %d. Vă rugăm să raportați problema.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Folosiți „fg” pentru a reveni la nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Suspendarea nu este activată"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "activată"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "dezactivată"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tastă nealocată"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Tastă nealocabilă: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tastă nealocată: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Tastă nealocabilă: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tastă nealocată: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tastă nealocată: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Numele cheii %s este nevalid"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Mărimea tab solicitată „%s” este nevalidă"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Mărimea de umplere solicitată „%s” este nevalidă"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Regex incorect „%s”: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Număr de rând sau coloană nevalid"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Greșeli în „%s”"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Bine ați venit la Nano. Pentru ajutor de bază, tastați CTRL+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nu"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Toate"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Eroare în %s pe rândul %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentul „%s” are un \" neterminat"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Șirurile regex trebuie să înceapă și să se termine cu caracterul \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex incorect „%s”: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Lipsește nume sintaxă"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Ghilimele lipsă în numele de sintaxă"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaxa „none” este rezervată"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Sintaxa „default” nu acceptă extensii"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Lipsește numele tastei"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Numele tastei este prea scurt"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Numele tastei trebuie să înceapă cu „^”, „M” sau „F”"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Numele cheii %s este nevalid"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 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:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Imposibil de mapat numele „%s“ la o funcție"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Imposibil de mapat numele „%s“ la un meniu"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funcția „%s“ nu există în meniul „%s“"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Ne pare rău, tasta „%s“ nu poate fi reasociată"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Eroare la extinderea %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Culoarea „%s” nu a fost înțeleasă"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "O culoare de fundal nu poate fi strălucitoare"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "O comandă „%s” necesită o comandă „syntax” precendentă"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Lipsește numele culorii"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Șirul regex lipsește după comanda „%s”"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Șir regex gol"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" necesită un \"end=\" corespunzător"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Sintaxa „default” nu acceptă șiruri regex „%s”"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Lipsă argument după „%s”"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argumentului „%s” îi lipsește \" de închidere"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Nicio tastă nu este asociată pentru funcția „%s” în meniul „%s”. Ieșire.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2250,58 +2290,58 @@ msgstr ""
 "Dacă este nevoie, folosiți nano cu opțiunea -I pentru a ajusta setările "
 "voastre nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nu s-a putut găsi sintaxa „%s” pentru extindere"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxa „%s” nu are comenzi de colorare"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comanda „%s” nu este permisă într-un fișier inclus"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comanda „%s” nu a fost înțeleasă"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Lipsește opțiunea"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opțiune „%s” necunoscută"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Imposibil de dezactivat opțiunea „%s”"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opțiunea „%s” necesită un argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argumentul nu este un șir multioctet valid"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Sunt necesare caractere care nu sunt goale"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Sunt necesare două caractere monocoloană"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nu pot găsi directorul meu acasă!  Uau!"
 
@@ -2364,238 +2404,251 @@ msgstr "Nu este o paranteză"
 msgid "No matching bracket"
 msgstr "Nu am găsit o paranteză pereche"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Marcaj aplicat"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Marcaj ridicat"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eroare la apelarea „%s”"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Comentarea nu este suportată pentru acest tip de fișier"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Nu se poate comenta după sfârșitul fișierului"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Nici o operație de anulat!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "adăugare de text"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "întrerupere rând"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "ștergere de text"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "În selecție:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "fuziune de rânduri"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "înlocuire de text"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Editează o înlocuire"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "ștergere"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "decupare de text"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "lipire de text"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "inserare de text"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "indentare"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "deindentare"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "comentați"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "decomentați"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Acțiune anulată (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Nimic de refăcut!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Acțiune refăcută (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Nu am putut crea o țeavă"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Nu am putut crea un proces nou"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtrare"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Eroare la deschidere intrării țeavă: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Șir greșit de citare %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Aliniază întregul fișier"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Acum este posibilă de-alinierea!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Aliniază paragraful curent"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Cuvânt negăsit: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Editează o înlocuire"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Cuvântul următor..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Se creează lista cuvintelor ortografiate greșit, vă rog așteptați..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Nu am putut obține dimensiunea spațiului țeavă"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Eroare la apelarea „spell”"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Eroare la apelarea „sort -f”"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Eroare la apelarea „uniq”"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Corectarea ortografică a eșuat: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificarea ortografiei a eșuat: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Verificarea ortografică s-a terminat"
 
-#: src/text.c:3037
+#: src/text.c:2801
 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:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Se lansează analiza statică, vă rugăm așteptați"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Comanda „%s” nu a produs niciun rând analizabil"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Nicun mesaj pentru acest fișier"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Primul mesaj"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Ultimul mesaj"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sCuvinte: %zu  Rânduri: %zd  Caractere: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "În selecție:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Intrare Verbatim"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Niciun fragment de cuvânt"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Nu mai sunt potriviri"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Nu sunt potriviri"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "nano nu mai are memorie!\n"
 
@@ -2621,79 +2674,126 @@ msgstr "Prea multe erori de la stdin\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Secvență necunoscută"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Intrare Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Lintare —"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Vedere"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Mod restricționat"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Avertismentele suplimentare au fost eliminate"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "rând %zd/%zd (%d%%), col %zu/%zu (%d%%), caract %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Prezentat de:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Mulțumiri speciale pentru:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Fundația Free Software"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "traducătorilor cei mulți și pentru TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "și oricine altcineva a fost uitat..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Mulțumim că folosiți nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Lipește"
+
+#~ msgid "Unjustify"
+#~ msgstr "Anul. alin."
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Lipește din memoria temporară în rândul curent"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Derulare fină"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Nu se adaugă rânduri noi la sfârșitul fișierelor"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Se folosește încă un rând pentru editare"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Setează punctul de rupere permanentă la coloana #număr"
+
+#~ msgid "text add"
+#~ msgstr "adăugare de text"
+
+#~ msgid "text delete"
+#~ msgstr "ștergere de text"
+
+#~ msgid "text replace"
+#~ msgstr "înlocuire de text"
+
+#~ msgid "text cut"
+#~ msgstr "decupare de text"
+
+#~ msgid "text uncut"
+#~ msgstr "lipire de text"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Șir greșit de citare %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Acum este posibilă de-alinierea!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tastă ilegală în afara modului multi-spațiu"
 
diff --git a/po/ru.po b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -33,9 +33,9 @@ msgstr "Не удаётся переместить каталог"
 msgid "Go To Directory"
 msgstr "К каталогу"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Отменено"
 
@@ -50,9 +50,9 @@ msgstr "Не удаётся записать за пределами %s"
 msgid "Can't move up a directory"
 msgstr "Не удаётся переместить каталог"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтения %s: %s"
@@ -98,17 +98,17 @@ msgstr "Это единственное совпадение"
 msgid "No current search pattern"
 msgstr "Нечего искать"
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Отсутствует название синтаксиса"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -205,7 +205,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Новый буфер"
 
@@ -316,51 +316,51 @@ msgstr "Файл для вставки [от %s] "
 msgid "File to insert [from %s]"
 msgstr "Файл для вставки [от %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Установить рабочий каталог"
 
-#: src/files.c:1521
+#: src/files.c:1517
 #, fuzzy
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Не удалось записать файл резервной копии, продолжить сохранение? (Ответьте Н "
 "- если не уверены)"
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Не удаётся переместить каталог"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не удаётся записать за пределами %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ошибка записи файла резервной копии %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Слишком много резервных файлов?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка записи временного файла: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ошибка записи %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -368,775 +368,770 @@ msgstr[0] "Записана %lu строка"
 msgstr[1] "Записано %lu строки"
 msgstr[2] "Записано %lu строк"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Копия]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Добавить выделенное в начало файла"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Добавить выделенное в конец файла"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Записать выделенное в файл"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Имя файла для добавления (в конец)"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Имя файла для добавления (в начало)"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Имя файла для записи"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 #, fuzzy
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Записать файл под ДРУГИМ ИМЕНЕМ?"
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Файл существует. ПЕРЕЗАПИСАТЬ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 #, fuzzy
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Файл был изменён после открытия. Продолжить сохранение?"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(ещё)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Выход"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Отмен. вырезку"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Отменить текущую функцию"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Показать эту справку"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Закрыть текущий буфер / Выйти из nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Записать текущий файл на диск"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Вставить другой файл в текущий"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Искать текст или регулярное выражение"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Искать текст или регулярное выражение"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Искать текст"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Искать текст"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 #, fuzzy
 msgid "Go to lefthand column"
 msgstr "Перейти на указанный номер строки и столбца"
 
-#: src/global.c:556
+#: src/global.c:550
 #, fuzzy
 msgid "Go to righthand column"
 msgstr "Перейти на указанный номер строки и столбца"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Перейти к первому файлу в списке"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Перейти к последнему файлу в списке"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Перейти на экран вверх"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Перейти на экран вниз"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Вырезать текущую строку и сохранить её в буфере обмена"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Вставить содержимое буфера обмена в текущую строку"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Вставить табуляцию в позиции курсора"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Показать положение курсора"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Проверить орфографию, если доступно"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Заменить текст или регулярное выражение"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Перейти на указанный номер строки и столбца"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Отметить текст от текущей позиции курсора"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Копировать текущую строку и сохранить ее в буфере обмена"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Увеличить отступ строки"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Уменьшить отступ строки"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Отменить последнее действие"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Повторить последнее отменённое действие"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Назад на один символ"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Вперёд на один символ"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Назад на одно слово"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Вперёд на одно слово"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "На предыдущую строку"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "На следующую строку"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "На начало текущей строки"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "В конец текущей строки"
 
-#: src/global.c:591
+#: src/global.c:585
 #, fuzzy
 msgid "Go to previous block of text"
 msgstr "На предыдущую строку"
 
-#: src/global.c:592
+#: src/global.c:586
 #, fuzzy
 msgid "Go to next block of text"
 msgstr "На следующую строку"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На начало текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "В конец текущего абзаца; потом следующего абзаца"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "На первую строку файла"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "На последнюю строку файла"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "На соответствующую скобку"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Прокрутить одну строку вверх, не перемещая курсор"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Прокрутить одну строку вниз, не перемещая курсор"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Перейти в предыдущий буфер"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Перейти в следующий буфер"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Вставить следующую комбинацию клавиш как есть"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Вставить табуляцию в позиции курсора"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Вставить строку в позиции курсора"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Удалить символ под курсором"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Удалить символ слева от курсора"
 
-#: src/global.c:622
-#, fuzzy
-msgid "Cut backward from cursor to word start"
-msgstr "Вырезать от курсора до конца строки"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr ""
 
-#: src/global.c:624
-#, fuzzy
-msgid "Cut forward from cursor to next word start"
-msgstr "Вырезать от курсора до конца строки"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вырезать от позиции курсора до конца файла"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Выровнять текущий абзац"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Выровнять по ширине текущий абзац"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Подсчитать количество слов, строк и символов"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Обновить текущий экран"
 
-#: src/global.c:639
+#: src/global.c:633
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Приостановить редактор (если включено)"
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Увеличить отступ строки"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 #, fuzzy
 msgid "Run the last recorded macro"
 msgstr "Отменить последнее действие"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Искать с учётом регистра"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Изменить направление поиска"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Использовать регулярные выражения"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Сбросить предыдущую строку поиска/замены"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Сбросить следующую строку поиска/замены"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Использовать формат DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Использовать формат Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Добавлять в конец"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Добавлять в начало"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Делать резервные копии оригинала"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Выполнить внешнюю команду"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Не преобразовывать из DOS/Mac формата"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Использовать новый буфер"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Перейти в файловый браузер"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Выйти из файлового браузера"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Перейти к первому файлу в списке"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Перейти к последнему файлу в списке"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Перейти к предыдущему файлу в списке"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Перейти к следующему файлу в списке"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Перейти к каталогу"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Проверить синтаксис кода, если доступно"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "На предыдущее сообщение"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "На следующее сообщение"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Помощь"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Записать"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "ЧитФайл"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Выровнять"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Поиск"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Замена"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Перейти к"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Вырезать"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Вырезать"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Словарь"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "ТекПозиц"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "К строке"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Отмена"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Повтор"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Отметить"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Копировать"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Уч.регистр"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Рег.выраж."
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Не заменять"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Выровнять"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "На скобку"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Поиск"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "След. строка"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Вперёд"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Пред. слово"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "След. слово"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Начало"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Конец"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Пред. строка"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "След. строка"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Прокрутить вверх"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Прокрутить вниз"
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Пред. слово"
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "След. слово"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "НачПар"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "КонПар"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "ПредCтр"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "СледCтр"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "ПервСтрока"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "ПослСтрока"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Предыдущий файл"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Следующий файл"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Табуляция"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Возврат каретки"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Удалить"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Вырезать"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Обрез. до конца"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Счётчик слов"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Подробный"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Приостановка"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Отступ"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "ОтмОтступа"
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "След. строка"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Отметить"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Пров. синтак."
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "К строке"
@@ -1218,59 +1213,60 @@ msgstr "След. сообщ. пров."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Режим справки"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Отображение постоянного положения курсора"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Плавная прокрутка"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Построчная прокрутка вместо полу-экранной"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Мягкий перенос длинных строк"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Отображение пробелов"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Подсветка синтаксиса"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Умная клавиша HOME"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Автоотступы"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Вырезать до конца"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Жесткий перенос длинных строк"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Конвертация табуляций в пробелы"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Поддержка мыши"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Приостановка"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1642,21 +1638,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Ошибка записи %s: %s"
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Неверная клавиша в режиме просмотра"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "Не удаётся выйти за границы %s в ограниченном режиме"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1665,7 +1661,7 @@ msgstr ""
 "\n"
 "Буфер записан в %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1674,7 +1670,7 @@ msgstr ""
 "\n"
 "Буфер не записан в %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1683,7 +1679,7 @@ msgstr ""
 "\n"
 "Буфер не записан в %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1694,301 +1690,315 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опция\t\tДлинная форма\t\tЗначение\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Включить умную клавишу home"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Делать резервные копии существующих файлов при сохранении"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Каталог для сохранения уникальных резервных файлов"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Использовать жирный шрифт вместо обычного"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Конвертировать табуляции в пробелы"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Использовать файлы блокировки (vim-стиль)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Сохранять и читать историю поиска/замены строк"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Не использовать на файлы nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Решить проблему зависания цифровой клавиатуры"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Не добавлять пустые строки в конце файла"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Не преобразовывать из DOS/Mac формата"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Использование дополнительной строки для редактирования"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Сохранять и загружать позицию курсора"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <стр>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<стр>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Запрещенный режим"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Построчная прокрутка вместо полу-экранной"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#чис>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#чис>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Установить ширину табуляции в #чис столбцов"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Делать быструю очистку строки состояния"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Показать версию и выйти"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Определять границы слов более точно"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "-X <str>"
 msgstr "-Q <стр>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "--wordchars=<str>"
 msgstr "--quotestr=<стр>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "--syntax=<стр>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Использовать описание синтаксиса для подсветки"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Не делать жесткий перенос длинных строк"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Постоянно показывать позицию курсора"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Решить проблему Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 #, fuzzy
 msgid "Show this help text and exit"
 msgstr "Показать эту справку"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Автоматический отступ на новых строках"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Вырезать от курсора до конца строки"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Разрешить использование мыши"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Не читать файл (только писать его)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Установить рабочий каталог"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Зарезервировать кнопки XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#столбцы>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#столбцы>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Установить точку жесткого переноса строки на #столбцы"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <программа>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<программа>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Использовать альтернативную программу проверки орфографии"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Автозапись при выходе, без лишних вопросов"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Режим просмотра (только чтение)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Не делать жесткий перенос длинных строк"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Не показывать две строки помощи внизу"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Разрешить приостановку"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Включить мягкий перенос строк"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano версия %s (собрано %s, %s)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Эл. почта: nano@nano-editor.org\tСайт: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1997,277 +2007,296 @@ msgstr ""
 "\n"
 " Параметры сборки:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не удалось повторно открыть стандартный ввод с клавиатуры\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Используйте «fg» для возврата в nano\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Запрошенный размер заполнения «%s» не подходит"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнения «%s» не подходит"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введите «%s -h» для получения списка доступных опций.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Плохое регулярное выражение «%s»: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Неправильный номер строки или столбца"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Нет"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Все"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Ошибка в позиции %s строки %lu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регулярных выражений должны начинаться и заканчиваться символом \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Плохое регулярное выражение «%s»: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Отсутствует название синтаксиса"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Отсутствует название синтаксиса"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксис «none» зарезервирован"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 #, fuzzy
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксис «default» не должен иметь расширений"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Отсутствует название клавиши"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Название ключа слишком короткое"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Привязки клавиш должны начинаться с «^», «M» или «F»"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Укажите функцию, которой назначается клавиша"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Вы должны указать имя меню (или «все») на которое нужно назначить/убрать "
 "назначение клавиши"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не удалось сопоставить имя «%s» к функции"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не удалось сопоставить имя «%s» к меню"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Привязка «%s» не может быть переназначена"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ошибка расширения %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Непонятная команда «%s»"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "Цвет фона «%s» не может быть светлым"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Отсутствует название цвета"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, fuzzy, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Отсутствует команда анализатора синтаксиса"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 #, fuzzy
 msgid "Empty regex string"
 msgstr "Отсутствует регулярное выражение"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» требует соответствующего «end=»"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Синтаксис «default» не должен иметь расширений"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2275,59 +2304,59 @@ msgstr ""
 "Используйте nano с опцией -I, если требуется подстроить параметры вашего "
 "nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не удалось сопоставить имя «%s» к расширению"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Команда «%s» не разрешена во включенном файле"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Непонятная команда «%s»"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Параметр отсутствует "
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Неизвестная опция «%s»"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не удалось снять опцию «%s»"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опция «%s» требует аргумент"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "Опция не правильная многобайтовая строка"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Требуется не пустой символ"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Требуется два однострочных символа"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не могу найти собственную домашнюю директорию! Йой!"
 
@@ -2391,240 +2420,253 @@ msgstr "Не скобка"
 msgid "No matching bracket"
 msgstr "Нет соответствующей скобки"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Метка установлена"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Метка снята"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ошибка выполнения «%s»"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Буфер отмены действий пуст!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "добавление текста"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "новая строка"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "удаление текста"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "В выделении:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "объединение строк"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "замена текста"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Редактировать замену"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "обрезка текста"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "отмена обрезки текста"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "вставка текста"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Автоотступы"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Автоотступы"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Отменённое действие (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Нечего повторять!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Повторённое действие (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Не удалось создать конвейер"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Не удалось создать дочерний процесс"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Недопустимая строка цитирования %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Сейчас можно отменить выравнивание!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2606
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Выровнять по ширине текущий абзац"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Выровнять текущий абзац"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Редактировать замену"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "След. слово"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт создание списка ошибочных слов. Подождите..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Не удалось получить размер буфера конвейера"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Ошибка выполнения «spell»"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Ошибка выполнения «sort -f»"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Ошибка выполнения «uniq»"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правописания не удалась: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правописания не удалась: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Проверка правописания завершена"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Для данного типа файла не настроена программа проверки синтаксиса!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Сохранить измененный буфер перед проверкой?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Запуск проверки, подождите"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Получено 0 распознанных строк от комманды: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Это сообщение о не открытом файле %s, открыть его в новом буфере?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Первое сообщение"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Последнее сообщение"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Ввод «как есть»"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Нет соответствующей скобки"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "Недостаточно памяти для nano!"
@@ -2651,79 +2693,84 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, fuzzy, c-format
 msgid "Unicode Input: %s"
 msgstr "Юникод код"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Дир:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Изменён"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Смотр"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Запрещенный режим"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "строка %ld/%ld (%d%%), столбец %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Текстовый редактор nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Предоставлен вам:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Особая благодарность:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (фонд свободного программного обеспечения)"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Для ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr ""
 "Дмитрию Рязанцеву за помощь в переводе и всем остальным, кого мы забыли "
 "упомянуть..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Спасибо за то, что выбрали nano!"
 
@@ -2802,12 +2849,21 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ "на новое место (%s)\n"
 #~ "(смотрите в nano FAQ об этом изменении)"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Отмен. вырезку"
+
+#~ msgid "Unjustify"
+#~ msgstr "Отмен. растяж."
+
 #~ msgid "WhereIs Next"
 #~ msgstr "Найти далее"
 
 #~ msgid "Exit from nano"
 #~ msgstr "Выход из nano"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Вставить содержимое буфера обмена в текущую строку"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "Повторить последний поиск"
 
@@ -2820,6 +2876,9 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Использование дополнительной строки для редактирования"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Плавная прокрутка"
+
 #~ msgid "Backup files"
 #~ msgstr "Резервные файлы"
 
@@ -2844,6 +2903,12 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ msgid "Enable multiple file buffers"
 #~ msgstr "Разрешить несколько файловых буферов"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Не добавлять пустые строки в конце файла"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Использование дополнительной строки для редактирования"
+
 #~ msgid "Quoting string"
 #~ msgstr "Строка цитирования"
 
@@ -2856,6 +2921,9 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ msgid "Silently ignore startup issues like rc file errors"
 #~ msgstr "Молча игнорировать ошибки запуска, например rc-файла"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Установить точку жесткого переноса строки на #столбцы"
+
 #~ msgid "Allow generic undo [EXPERIMENTAL]"
 #~ msgstr "Разрешить функцию отмены действий [ЭКСПЕРИМЕНТАЛЬНАЯ]"
 
@@ -2922,9 +2990,24 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ "Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою "
 #~ "работу."
 
+#~ msgid "text add"
+#~ msgstr "добавление текста"
+
+#~ msgid "text delete"
+#~ msgstr "удаление текста"
+
 #~ msgid "line wrap"
 #~ msgstr "перенос строки"
 
+#~ msgid "text cut"
+#~ msgstr "обрезка текста"
+
+#~ msgid "text uncut"
+#~ msgstr "отмена обрезки текста"
+
+#~ msgid "text replace"
+#~ msgstr "замена текста"
+
 #~ msgid "Internal error: unknown type.  Please save your work."
 #~ msgstr "Внутренняя ошибка: неизвестный тип. Сохраните свою работу"
 
@@ -2937,6 +3020,12 @@ msgstr "Спасибо за то, что выбрали nano!"
 #~ msgstr ""
 #~ "Внутренняя ошибка: ошибка настройки отмены обрезки. Сохраните свою работу."
 
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Недопустимая строка цитирования %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Сейчас можно отменить выравнивание!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Запуск проверки орфографии, подождите"
 
diff --git a/po/sl.po b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\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"
@@ -32,9 +32,9 @@ msgstr "Mape ni mogoče premakniti višje"
 msgid "Go To Directory"
 msgstr "Pojdi v mapo"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Preklicano"
 
@@ -49,9 +49,9 @@ msgstr "Ni mogoče pisati zunaj %s"
 msgid "Can't move up a directory"
 msgstr "Mape ni mogoče premakniti višje"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Napaka med branjem %s: %s"
@@ -97,17 +97,17 @@ msgstr "To je edina pojavitev niza"
 msgid "No current search pattern"
 msgstr "Ni trenutnega vzorca iskanja"
 
-#: src/color.c:182
+#: src/color.c:184
 #, fuzzy, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Manjka ime skladnje"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr ""
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr ""
@@ -206,7 +206,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Nov medpomnilnik"
 
@@ -322,51 +322,51 @@ msgstr "Datoteka za vstavitev [iz %s] "
 msgid "File to insert [from %s]"
 msgstr "Datoteka za vstavitev [iz %s] "
 
-#: src/files.c:1472
-#, fuzzy
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Nastavi mapo delovanja"
 
-#: src/files.c:1521
+#: src/files.c:1517
 #, fuzzy
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Varnostne datoteke ni mogoče zapisati. Ali želite datoteko vseeno shraniti? "
 "Če niste popolnoma prepričani, pritisnite N."
 
-#: src/files.c:1538
-#, fuzzy
-msgid "Invalid backup directory\n"
-msgstr "Mape ni mogoče premakniti višje"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr ""
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ni mogoče pisati zunaj %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Napaka med pisanjem datoteke varnostne kopije %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Ali je preveč varnostnih kopij datotek?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Napaka med pisanjem v začasno datoteko: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Napaka med pisanjem %s:%s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, fuzzy, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -375,789 +375,782 @@ msgstr[1] "Zapisana je %lu vrstica"
 msgstr[2] "Zapisani sta %lu vrstici"
 msgstr[3] "Zapisane so %lu vrstice"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Oblika DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Oblika Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Varnostna kopija]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Pripni izbiro pred datoteko"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Pripni izbiro datoteki"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Zapiši izbiro v datoteko"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Ime datoteke, ki naj bo pripeta na začetek"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Ime datoteke, ki naj bo pripeta"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Ime datoteke za zapis"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr ""
 
-#: src/files.c:2254
+#: src/files.c:2249
 #, fuzzy
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Ali želite datoteko shraniti z DRUGIM imenom? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, fuzzy, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr ""
 
-#: src/files.c:2291
+#: src/files.c:2285
 #, fuzzy
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "Datoteka je bila po odpiranju spremenjena. Ali jo želite vseeno shraniti? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(več)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Zapri"
 
-#: src/global.c:527
-#, fuzzy
-msgid "Uncut Text"
-msgstr "Odizr. be."
-
-#: src/global.c:529
-#, fuzzy
-msgid "Unjustify"
-msgstr "Odporavnaj"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Prekliči trenutno funkcijo"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Pokaži to besedilo pomoči"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Zapri trenutni medpomnilnik datoteke / Končaj nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Zapiši trenutno datoteko na disk"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Vstavi drugo datoteko v trenutno"
 
-#: src/global.c:547
+#: src/global.c:541
 #, fuzzy
 msgid "Search forward for a string or a regular expression"
 msgstr "Poišči niz znakov ali logični izraz"
 
-#: src/global.c:549
+#: src/global.c:543
 #, fuzzy
 msgid "Search backward for a string or a regular expression"
 msgstr "Poišči niz znakov ali logični izraz"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Poišči niz znakov ali logični izraz"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr ""
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:549
 #, fuzzy
 msgid "Go to lefthand column"
 msgstr "Pojdi v številko vrstice in stolpca"
 
-#: src/global.c:556
+#: src/global.c:550
 #, fuzzy
 msgid "Go to righthand column"
 msgstr "Pojdi v številko vrstice in stolpca"
 
-#: src/global.c:557
+#: src/global.c:551
 #, fuzzy
 msgid "Go to first row in this column"
 msgstr "Pojdi k prvi datoteki na seznamu"
 
-#: src/global.c:558
+#: src/global.c:552
 #, fuzzy
 msgid "Go to last row in this column"
 msgstr "Pojdi k zadnji datoteki na seznamu"
 
-#: src/global.c:561
+#: src/global.c:555
 #, fuzzy
 msgid "Go one screenful up"
 msgstr "Pojdi na naslednji zaslon"
 
-#: src/global.c:562
+#: src/global.c:556
 #, fuzzy
 msgid "Go one screenful down"
 msgstr "Pojdi na naslednji zaslon"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Izreži trenutno vrstico in jo shrani v medpomnil. izreza"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Vstavi tabulator na položaju kazalke"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Prikaži položaj kazalke"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Zamenjaj niz ali logični izraz"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Pojdi v številko vrstice in stolpca"
 
-#: src/global.c:574
+#: src/global.c:568
 #, fuzzy
 msgid "Mark text starting from the cursor position"
 msgstr "Označi besedilo na mestu kazalke"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Kopiraj trenutno vrstico in jo shrani v medpomni. izreza"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Zamakni trenutno vrstico"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Odstrani zamik trenutne vrstice"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Razveljavi zadnje dejanje"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Uveljavi zadnje razveljavljeno dejanje"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Pojdi nazaj za en znak"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Pojdi naprej za en znak"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Pojdi nazaj za eno besedo"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Pojdi naprej za eno besedo"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Pojdi v naslednjo vrstico"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Pojdi na začetek trenutne vrstice"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Pojdi na konec trenutne vrstice"
 
-#: src/global.c:591
+#: src/global.c:585
 #, fuzzy
 msgid "Go to previous block of text"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:592
+#: src/global.c:586
 #, fuzzy
 msgid "Go to next block of text"
 msgstr "Pojdi v naslednjo vrstico"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pojdi na začetek odstavka; nato prejšnjega odstavka"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Pojdi preko konca odstavka; nato naslednjega odstavka"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Pojdi v prvo vrstico datoteke"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Pojdi v zadnjo vrstico datoteke"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Pojdi do ujemajočega oklepaja"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Pomakni se navzgor za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Pomakni se navzdol za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Preklopi na prejšnji medpomnilnik datoteke"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Preklopi na naslednji medpomnilnik datoteke"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Vstavi naslednji natančni pritisk tipk"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Vstavi tabulator na položaju kazalke"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Vstavi novo vrstico na položaju kazalke"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Izbriši znak pod kazalko"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Izbriši znak levo od kazalke"
 
-#: src/global.c:622
-#, fuzzy
-msgid "Cut backward from cursor to word start"
-msgstr "Izreži od kazalke do konca vrstice"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr ""
 
-#: src/global.c:624
-#, fuzzy
-msgid "Cut forward from cursor to next word start"
-msgstr "Izreži od kazalke do konca vrstice"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr ""
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Poravnaj trenutni odstavek"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Poravnaj celotno datoteko"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Preštej število besed, vrstic in znakov"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Osveži (ponovno nariši) trenutni zaslon"
 
-#: src/global.c:639
+#: src/global.c:633
 #, fuzzy
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Daj urejevalnik v pripravljenost (če je omogočeno)"
 
-#: src/global.c:641
+#: src/global.c:635
 #, fuzzy
 msgid "Try and complete the current word"
 msgstr "Zamakni trenutno vrstico"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr ""
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr ""
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr ""
 
-#: src/global.c:652
+#: src/global.c:646
 #, fuzzy
 msgid "Run the last recorded macro"
 msgstr "Razveljavi zadnje dejanje"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Preklopi ločevanje velikosti črk iskanja"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Obrni smer iskanja"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Preklopi uporabo logičnih izrazov"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Prikliči predhodni niz iskanja/zamenjave"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Prikliči naslednji niz iskanja/zamenjave"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Preklopi uporabo oblike DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Preklopi uporabo oblike Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Preklopi pripenjanje"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Preklopi pripenjanje na začetek"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Preklopi ustvarjanje varnostne kopije izvirne datoteke"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Izvedi zunanji ukaz"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Ne pretvarjaj datotek iz oblike DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Preklopi uporabo novega medpomnilnika"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr ""
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Pojdi v brskalnik datotek"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Končaj brskalnik datotek"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Pojdi k prvi datoteki na seznamu"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Pojdi k zadnji datoteki na seznamu"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Pojdi k predhodni datoteki na seznamu"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Pojdi k naslednji datoteki na seznamu"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Pojdi v mapo"
 
-#: src/global.c:691
+#: src/global.c:685
 #, fuzzy
 msgid "Invoke the linter, if available"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/global.c:692
+#: src/global.c:686
 #, fuzzy
 msgid "Go to previous linter msg"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:693
+#: src/global.c:687
 #, fuzzy
 msgid "Go to next linter msg"
 msgstr "Pojdi v naslednjo vrstico"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Pomoč"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/global.c:724
+#: src/global.c:718
 #, fuzzy
 msgid "Write Out"
 msgstr "Zapiši"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Odpri dat."
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Poravnaj"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Poišči"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Zamenjaj"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Pojdi v mapo"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Izre. bes."
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Izre. bes."
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Črkuj"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Položaj kaz."
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "V vrstico"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Uveljavi"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Ozna. bes."
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopi. bes."
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Loč. črk"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Log. izraz"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Nazaj"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Brez. zam."
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Pop. por."
 
-#: src/global.c:837
+#: src/global.c:830
 #, fuzzy
 msgid "To Bracket"
 msgstr "Ni oklepaj"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr ""
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 #, fuzzy
 msgid "Where Was"
 msgstr "Poišči"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 #, fuzzy
 msgid "Previous"
 msgstr "Predhodna datoteka"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 #, fuzzy
 msgid "Next"
 msgstr "Nasl. str."
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Nazaj"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Naprej"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Pred. bes."
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Nasl. bes."
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Domov"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Pred. vrs."
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Nasl. vrs."
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Pomik gor"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Pomik dol"
 
-#: src/global.c:893
+#: src/global.c:896
 #, fuzzy
 msgid "Prev Block"
 msgstr "Pred. bes."
 
-#: src/global.c:895
+#: src/global.c:898
 #, fuzzy
 msgid "Next Block"
 msgstr "Nasl. bes."
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Zač. odst."
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Kon. odst."
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Pred. str."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Nasl. str."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Prva vrst."
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Zad. vrst."
 
-#: src/global.c:915
+#: src/global.c:918
 #, fuzzy
 msgid "Prev File"
 msgstr "Predhodna datoteka"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Naslednja datoteka"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Vračalka"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-#, fuzzy
-msgid "Cut Left"
-msgstr "Izre. bes."
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr ""
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+msgid "Chop Right"
 msgstr ""
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "IzrezDoKonca"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Štetje besed"
 
-#: src/global.c:963
+#: src/global.c:966
 #, fuzzy
 msgid "Verbatim"
 msgstr "Natančni vnos"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "V priprav."
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "Zama. bes."
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Odzam. be."
 
-#: src/global.c:979
+#: src/global.c:984
 #, fuzzy
 msgid "Comment Lines"
 msgstr "Nasl. vrs."
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr ""
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr ""
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr ""
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Ozna. bes."
 
-#: src/global.c:997
+#: src/global.c:1002
 #, fuzzy
 msgid "To Linter"
 msgstr "V vrstico"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr ""
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Nasl. bes."
@@ -1241,61 +1234,62 @@ msgstr "Nasl. vrs."
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Način pomoči"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Stalni prikaz položaja kazalke"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Gladko drsenje"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Pomikaj se vrstično namesto pol-zaslonsko"
 
-#: src/global.c:1404
+#: src/global.c:1414
 #, fuzzy
 msgid "Soft wrapping of overlong lines"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Prikaz presledkov"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Barvno poudarjanje skladnje"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Pametna tipka za Domov"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Samodejno zamikanje"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Izreži do konca"
 
-#: src/global.c:1416
+#: src/global.c:1426
 #, fuzzy
 msgid "Hard wrapping of overlong lines"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Pretvarjanje tabulatorjev v presledne znake"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Podpora za miško"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Stanje pripravljenosti"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr ""
 
@@ -1661,21 +1655,21 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Napaka med pisanjem %s:%s"
 
-#: src/nano.c:537
+#: src/nano.c:533
 #, fuzzy
 msgid "Key is invalid in view mode"
 msgstr "Ključ je neveljaven v načinu pogleda"
 
-#: src/nano.c:543
+#: src/nano.c:539
 #, fuzzy
 msgid "This function is disabled in restricted mode"
 msgstr "V omejenem načinu ni mogoče zapustiti %s"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr ""
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1684,7 +1678,7 @@ msgstr ""
 "\n"
 "Medpomnilnik je zapisan v %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1693,7 +1687,7 @@ msgstr ""
 "\n"
 "Medpomnilnik ni zapisan v %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1702,7 +1696,7 @@ msgstr ""
 "\n"
 "Medpomnilnik ni zapisan: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, fuzzy, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1713,304 +1707,316 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Možnost\t\tdolga možnost GNU\t\tPomen\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Omogoči pametno tipko za Domov"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Shrani varnostne kopije obstoječih datotek"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <mapa>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<mapa>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Mapa za shranjevanje edinstvenih varnostnih kopij"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Uporabi krepko namesto obratnega besedila videa"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Pretvori vpisane tabulatorske znake v presledke"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr ""
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Uporabi zaklepne datoteke"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Beleži in beri zgodovino niza iskanja in zamenjave"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Ne glej datotek nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr ""
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Popravi težavo z zmedo s tipkami številčnice"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Ne dodajaj novih vrstic na konec datotek"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ne pretvarjaj datotek iz oblike DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Uporabi eno ali več vrstic za urejanje"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Shrani in preberi mesto kazalke"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <niz>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<niz>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Omejen način"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Pomikaj se vrstično namesto pol-zaslonsko"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <št. stolpcev>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<št. stolpcev>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavi širino tabulatorja na št. stolpcev stolpcev"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Hitro prazni vrstico stanja"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Prikaži podrobnosti različice in končaj"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Zaznaj meje besed natančneje"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "-X <str>"
 msgstr "-Q <niz>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 #, fuzzy
 msgid "--wordchars=<str>"
 msgstr "--quotestr=<niz>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr ""
 
-#: src/nano.c:844
+#: src/nano.c:842
 #, fuzzy
 msgid "--syntax=<name>"
 msgstr "--syntax=<niz>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Uporaba določila skladnje za barvanje"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Samodejno zamakni nove vrstice"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Nenehno kaži položaj kazalke"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Popravi težavo zmede tipk vračalke/izbriši"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:861
 #, fuzzy
 msgid "Show this help text and exit"
 msgstr "Pokaži to besedilo pomoči"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Samodejno zamakni nove vrstice"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Izreži od kazalke do konca vrstice"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr ""
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Omogoči uporabo miške"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <mapa>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<mapa>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Nastavi mapo delovanja"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Ohrani tipke XON (^Q) in XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <št. stolpcev>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<št. stolpcev>"
 
-#: src/nano.c:877
-#, fuzzy
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Nastavi točko preloma na stolpcu št. stoplca"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Omogoči nadomestni črkovalnik"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Samodejno shrani ob izhodu in ne pokaži poziva"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Način pogleda (samo za branje)"
 
-#: src/nano.c:890
+#: src/nano.c:896
 #, fuzzy
-msgid "Don't hard-wrap long lines"
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Ne pokaži dveh vrstic pomoči"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Omogoči stanje pripravljenosti"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Omogoči blage prelome vrstic"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, fuzzy, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano različica %s (kodno prevedena %s, %s)\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr ""
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 " Elektronska pošta: nano@nano-editor.org\tSplet: http://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -2019,276 +2025,295 @@ msgstr ""
 "\n"
 " Kodno prevedene možnosti:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr ""
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Za vrnitev v nano uporabite \"fg\".\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "omogočeno"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "onemogočeno"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr ""
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr ""
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr ""
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr ""
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr ""
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr ""
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Slab logični izraz \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Neveljavna številka vrstice ali stolpca"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr ""
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "DdYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnNn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "VvAa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ne"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Vse"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Napaka v %s v vrstici %lu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' ima neuničen \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Nizi logičnega izraza se morajo začeti in končati z znakom \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slab logični izraz \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Manjka ime skladnje"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Manjka ime skladnje"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladnja \"none\" je pridržana"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 #, fuzzy
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Manjka ime tipke"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 #, 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:383
+#: src/rcfile.c:388
 #, fuzzy, c-format
 msgid "Key name %s is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 #, 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:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Ni mogoče preslikati imena \"%s\" k funkciji"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, fuzzy, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:466
-#, fuzzy, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
+#: src/rcfile.c:477
+#, c-format
+msgid "Keystroke %s may not be rebound"
+msgstr ""
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Napaka med branjem %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Ukaz \"%s\" ni razumljiv"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 #, fuzzy
 msgid "A background color cannot be bright"
 msgstr "Barva ozadja \"%s\" ne more biti svetla"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, fuzzy, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Manjka niz logičnega izraza"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 #, fuzzy
 msgid "Empty regex string"
 msgstr "Manjka niz logičnega izraza"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" potrebuje ustrezen \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, fuzzy, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr ""
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, fuzzy, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argument '%s' ima neuničen \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2296,60 +2321,60 @@ msgstr ""
 "Poteka končanje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
 "nano z možnostjo -I.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladnja \"%s\" nima ukazov barv"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ukaz \"%s\" ni dovoljen v vključeni datoteki"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ukaz \"%s\" ni razumljiv"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 #, fuzzy
 msgid "Missing option"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznana zastavica \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ni mogoče ponastaviti zastavice \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Možnost \"%s\" zahteva argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 #, fuzzy
 msgid "Argument is not a valid multibyte string"
 msgstr "Možnost ni veljaven večbajtni niz"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Zahtevani so ne-prazni znaki"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Potrebna sta dva enostolpčna znaka"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ni mogoče najti domače mape!"
 
@@ -2414,243 +2439,256 @@ msgstr "Ni oklepaj"
 msgid "No matching bracket"
 msgstr "Ni ujemajočega oklepaja"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Označba je nastavljena"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Označba je ponastavljena"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Napaka pri priklicu \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr ""
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr ""
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Ničesar ni v medpomnilniku razveljavitve!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "dodaj besedilo"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "prekini vrstico"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "izbriši besedilo"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "V izboru:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "združi vrstici"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "zamenjaj besedilo"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Uredi zamenjavo"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "izreži besedilo"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "odizreži besedilo"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "vnesi besedilo"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 #, fuzzy
 msgid "indent"
 msgstr "Samodejno zamikanje"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 #, fuzzy
 msgid "unindent"
 msgstr "Samodejno zamikanje"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr ""
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr ""
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Ponastavljeno dejanje (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Ničesar ni mogoče uveljaviti!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Uveljavljeno dejanje (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Ni mogoče ustvariti cevi"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Ni mogoče razvejiti"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr ""
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Slab niz navedka %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Zdaj je mogoče preklicati poravnavo!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Poravnaj celotno datoteko"
 
-#: src/text.c:2606
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Poravnaj trenutni odstavek"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr ""
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Uredi zamenjavo"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 #, fuzzy
 msgid "Next word..."
 msgstr "Nasl. bes."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Ustvarjanje napačno črkovanega seznama besed, počakajte ..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Ni mogoče pridobiti velikosti medpomnilnika cevi"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Napaka pri priklicu \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Napaka pri priklicu \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Napaka pri priklicu \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Končano preverjanje črkovanja"
 
-#: src/text.c:3037
+#: src/text.c:2801
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ne dodajaj novih vrstic na konec datotek"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 #, fuzzy
 msgid "At first message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3329
+#: src/text.c:3093
 #, fuzzy
 msgid "At last message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "V izboru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Natančni vnos"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr ""
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 #, fuzzy
 msgid "No matches"
 msgstr "Ni ujemajočega oklepaja"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "Programu nano je zmanjkalo pomnilnika!"
@@ -2677,76 +2715,81 @@ msgstr ""
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr ""
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, fuzzy, c-format
 msgid "Unicode Input: %s"
 msgstr "Vnos Unikod"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "MAPA:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Pogled"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Omejen način"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr ""
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "vrstica %ld/%ld (%d%%), stolpec %lu/%lu (%d%%), znak %lu/%lu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Urejevalnik besedil nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "različica"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Zaslužni za izid programa:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Posebna zahvala:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr ""
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "in vse, ki smo jih pozabili navesti ..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Hvala, ker uporabljate nano!"
 
@@ -2854,15 +2897,27 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "Go to previous screen"
 #~ msgstr "Pojdi na predhodni zaslon"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
+
 #~ msgid "Repeat last search"
 #~ msgstr "Ponovi zadnje iskanje"
 
+#~ msgid "UnJustify"
+#~ msgstr "Odporavnaj"
+
+#~ msgid "UnCut Text"
+#~ msgstr "Odizr. be."
+
 #~ msgid "Find Other Bracket"
 #~ msgstr "Najdi drug oklepaj"
 
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Uporaba ene vrstice več za urejanje"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Gladko drsenje"
+
 #~ msgid "Long line wrapping"
 #~ msgstr "Prelomi dolgih vrstic"
 
@@ -2893,6 +2948,9 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "Enable multiple file buffers"
 #~ msgstr "Omogoči več medpomnilnikov datotek"
 
+#~ msgid "Use one more line for editing"
+#~ msgstr "Uporabi eno ali več vrstic za urejanje"
+
 #~ msgid "Quoting string"
 #~ msgstr "Niz za navajanje"
 
@@ -2905,6 +2963,9 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "Silently ignore startup issues like rc file errors"
 #~ msgstr "Tiho prezri težave začenjanja kot napake datoteke rc"
 
+#~ msgid "Set wrapping point at column #cols"
+#~ msgstr "Nastavi točko preloma na stolpcu št. stoplca"
+
 #~ msgid "Allow generic undo [EXPERIMENTAL]"
 #~ msgstr "Dovoli splošno razveljavitev [POSKUSNO]"
 
@@ -2941,6 +3002,9 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "Must specify menu to bind key to (or \"all\")"
 #~ msgstr "Treba je navesti meni, ki se veže na tipko (ali \"all\")"
 
+#~ msgid "Sorry, keystr \"%s\" is an illegal binding"
+#~ msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
+
 #~ msgid ""
 #~ "Color \"%s\" not understood.\n"
 #~ "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -2977,9 +3041,24 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgstr ""
 #~ "Notranja napaka: ni mogoče primerjati vrstice %d. Shranite svoje delo."
 
+#~ msgid "text add"
+#~ msgstr "dodaj besedilo"
+
+#~ msgid "text delete"
+#~ msgstr "izbriši besedilo"
+
 #~ msgid "line wrap"
 #~ msgstr "prelomi vrstico"
 
+#~ msgid "text cut"
+#~ msgstr "izreži besedilo"
+
+#~ msgid "text uncut"
+#~ msgstr "odizreži besedilo"
+
+#~ msgid "text replace"
+#~ msgstr "zamenjaj besedilo"
+
 #~ msgid "Internal error: unknown type.  Please save your work"
 #~ msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo"
 
@@ -2998,6 +3077,12 @@ msgstr "Hvala, ker uporabljate nano!"
 #~ msgid "Internal error: unknown type.  Please save your work."
 #~ msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
 
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Slab niz navedka %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Zdaj je mogoče preklicati poravnavo!"
+
 #~ msgid "File:"
 #~ msgstr "Datoteka:"
 
diff --git a/po/sr.po b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-2.9.4-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-03-19 05:33+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -29,9 +29,9 @@ msgstr "Не могу да отворим директоријум: %s"
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Отказано"
 
@@ -46,9 +46,9 @@ msgstr "Не могу да идем ван „%s“"
 msgid "Can't move up a directory"
 msgstr "Не могу да идем директоријум изнад"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при читању „%s“: %s"
@@ -94,17 +94,17 @@ msgstr "Ово је једина појава"
 msgid "No current search pattern"
 msgstr "Нема шаблона текуће претраге"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Непознат назив синтаксе: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "„magic_load()“ није успело: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "„magic_file(%s)“ није успело: %s"
@@ -201,7 +201,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Нова међумеморија"
 
@@ -310,48 +310,50 @@ msgstr "Датотека за унос [из „%s“]"
 msgid "File to insert [from %s]"
 msgstr "Датотека за унос [из „%s“]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Неисправан радни директоријум\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Нисам успео да запишем датотеку резерве; да наставим са чувањем? (Одговорите "
 "са „N“ ако нисте сигурни.) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Неисправан директоријум резерве\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не могу да пишем ван %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка записивања датотеке резерве „%s“: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Превише резервних датотека?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка писања привремене датотеке: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка приликом писања „%s“: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -359,749 +361,751 @@ msgstr[0] "Уписах %zu ред"
 msgstr[1] "Уписах %zu реда"
 msgstr[2] "Уписах %zu редова"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [ДОС запис]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Мек запис]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Резерва]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Додаје избор на почетак датотеке"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Додаје избор на крај датотеке"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Уписује избор у датотеку"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Назив датотеке којој ће претходити"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Назив датотеке за којом ће следити"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Назив датотеке у којој ће уписати"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Датотека постоји —— не могу да је препишем"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Да сачувам датотеку под ДРУГАЧИЈИМ НАЗИВОМ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Датотека „%s“ постоји, да ПРЕСНИМИМ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Датотека на диску је измењена"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Датотека је измењена од када сте је отворили; да наставим са чувањем? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(још)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Изађи"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Затвори"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Не сеци текст"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Отказује текућу операцију"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Приказује текст ове помоћи"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Затвара текућу међумеморију / излази из нана"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Уписује текућу међумеморију (или назначену област) на диск"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Умеће другу фатотеку у текућу међумеморију (или у нову)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Тражи унапред ниску или регуларни израз"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Тражи уназа ниску или регуларни израз"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Тражи ниску"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Тражи ниску"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Освежава списак датотека"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Иде на стубац са леве стане"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Иде на стубац са десне стане"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Иде на први ред у овом ступцу"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Иде на последњи ред у овом ступцу"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "На следећи екран"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "На претходни екран"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Исеца текући ред (или означену област) и смешта га у исечке"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Убацује исечак у текући ред"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Умеће табулатор на положај курсора"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Приказује положај курзора"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Покреће проверу правописа, ако је доступна"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Замењује ниску или регуларни израз"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "На ред и број ступца"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Означава текст почевши од положаја курзора"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Исеца текући ред (или означену област) и смешта га у исечке"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Увлачи текући ред (или означене редове)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Увлачи текући ред (или означене редове)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Поништава увлачење текућег реда (или означених редова)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Поништава последњу радњу"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Враћа последњу поништену радњу"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Иде један знак уназад"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Иде један знак унапред"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Иде једну реч уназад"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Иде једну реч унапред"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "На претходни ред"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "На следећи ред"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "На почетак текућег реда"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "На крај текућег реда"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Иде на претходни блок текста"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Иде на следећи блок текста"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На почетак пасуса; затим претходног пасуса"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Иде одмах после краја пасуса; затим следећег пасуса"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Иде у први ред датотеке"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Иде у последњи ред датотеке"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "На одговарајућу заграду"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Помера се један ред горе без померања курсора"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Помера се један ред доле без померања курсора"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Пребацује се на међумеморију претходне датотеке"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Пребацује се на међумеморију следеће датотеке"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Умеће следећу дословност притиска тастера"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Умеће табулатор на положај курсора"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Умеће нови ред на положај курсора"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Брише знак под курзором"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Брише знак лево од курзора"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Исеца уназад од курзора до почетка реда"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Исеца унапред од курзора до почетка следеће речи"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Одсеца од положаја курзора до краја датотеке"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Поравнава текући пасус"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Поравнава читаву датотеку"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Броји речи, редова, и знакова"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Освежава (поново исцртава) текући екран"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Обуставља уређивача (ако је обустављање укључено)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Покушава и довршава текућу реч"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Поставља/уклања напомену текућег реда (или означених редова)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Чува датотеку без постављања упита"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Тражи следеће појављивање уназад"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Тражи следеће појављивање унапред"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Покреће/зауставља снимање макроа"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Покреће последњи снимљени макро"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Пребацује осетљивост величине слова у претрази"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Заокреће правац претраге"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Пребацује коришћење регуларних израза"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Опозива ниску претходне претраге и замене"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Опозива ниску следеће претраге и замене"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Пребацује коришћење ДОС записа"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Пребацује коришћење Мекинтош записа"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Пребацује додавање након"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Пребацује додавање пре"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Пребацује стварање резерве изворне датотеке"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Извршава спољну наредбу"
 
-#: src/global.c:674
+#: src/global.c:668
 #, fuzzy
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Уписује текућу међумеморију (или назначену област) на диск"
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Не претвара датотеке из ДОС/Мекинтош записа"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Пребацује коришћење нове међумеморије"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Затвара међумеморију без чувања"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Иде у прегледач датотека"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Излази из прегледача датотека"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Иде у прву датотеку на списку"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Иде у последњу датотеку на списку"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "На претходну датотеку на списку"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Иде у следећу датотеку на списку"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Иде у директоријум"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Покреће чистача, ако је доступан"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Иде на претходну поруку чистача"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Иде на следећу поруку чистача"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Добави помоћ"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Испиши"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Читај датотеку"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Пораванај"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Освежи"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Где је"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Замени"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "У директорјум"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Исеци текст"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Исеци текст"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "На проверу писања"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Положај курзора"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "На ред"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Опозови"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Поврати"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Означи текст"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Умножи текст"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Вел. слова"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Рег. израз"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Уназад"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Не мењај"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Пуно поравнање"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "До заграде"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Сачувај"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Где беше"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Претходно"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Следеће"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Следећа реч"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Претходни ред"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Следећи ред"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Помакни горе"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Помакни доле"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Претходни блок"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Следећи блок"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Почeтaк пасуса"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Крај пасуса"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Претходна страна"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Следећа страна"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Први ред"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Последњи ред"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Претходна датотека"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Унеси"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Врати простор"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Обриши"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Исеци лево"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Исеци десно"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "Исеци до краја"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Изброј речи"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Вербатим"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Обустави"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "увлачење"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "поништавање увлачења"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Комент. редове"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Доврши"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Сними"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Покрени макро"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Означи текст"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "На чишћење"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Сачувај"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "На текст"
@@ -1183,59 +1187,60 @@ msgstr "След пор чистч"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Сталан приказ положаја курзора"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Глатко клизање"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Премиче по ред уместо пола екрана"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Слабо преламање превише дугих редова"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Приказ празнина"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Истицање синтаксе у боји"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Паметни тастер „Почетак“"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Исецање до краја"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Јако преламање превише дугих редова"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Претварање укуцаних табулатора у размаке"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Обустави"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Набрајање редова"
 
@@ -1605,19 +1610,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Грешка писања „%s“: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Тастер је неисправан у режиму прегледа"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Ова функција је искључена у ограниченом режиму"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Помоћ није доступна"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1626,7 +1631,7 @@ msgstr ""
 "\n"
 "Међумеморија је уписана у %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1635,7 +1640,7 @@ msgstr ""
 "\n"
 "Међумеморија није уписана у %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1644,7 +1649,7 @@ msgstr ""
 "\n"
 "Међумеморија није уписана: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1655,7 +1660,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1664,7 +1669,7 @@ msgstr ""
 "Да поставите курзор на одређени ред у датотеци, ставите број реда са\n"
 "знаком + пре назива датотеке.  Број ступца се може додати после зареза.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1673,284 +1678,299 @@ msgstr ""
 "Када је назив датотеке -, нано чита податке са стандардног улаза.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опција\t\tГнуова дуга опција\tЗначење\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Укључује паметни тастер „Почетак“"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Чува резерве постојећих датотека"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C [дир]"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=[дир]"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Директоријум за чување јединствених датотека резерве"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Користи подебљање уместо обрнутог видео текста"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Претвара укуцане табулаторе у размаке"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Чита датотеку у нову међумеморију по основи"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Користи (вим-стила) датотеке закључавања"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Бележи и чита историјат претраге/замене ниске"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Не тражи у нанорц датотекама"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Иде на први ред у овом ступцу"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Поправља проблеме тастера нумеричке тастатуре"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Не додаје нове редове на крајеве датотека"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Крати крајње размаке приликом јаког преламања"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Не претвара датотеке из ДОС/Мекинтош записа"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Користи још један ред за уређивање"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Бележи и чита место положаја курзора"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q [ниска]"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=[ниска]"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Ограничени режим"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Премиче по ред уместо пола екрана"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T [#ступци]"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[#ступци]"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Поставља ширину табулатора на „#ступци“ стубаца"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Обавља брзо чишћење траке стања"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Исписује податке о издању и излази"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Тачније открива границе речи"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X [ниска]"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=[ниска]"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Који други знаци су делови речи"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <назив>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<назив>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Одредница синтаксе за обојавање"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Приликом меког преламања, чини то на празнинама"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Не прелама јако дуге редове"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Непрекидно приказује положај курзора"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Поправља проблеме тастера Поврати простор/Обриши"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Приказује курзор у прегледачу датотека"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Приказује овај текст помоћи и излази"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Самостално увлачи нове редове"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Исеца од курзора до краја реда"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Приказује бројеве редова испред текста"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Укључује коришћење миша"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Не чита датотеку (само је пише)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o [дир]"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[дир]"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Поставља радни директоријум"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Очувава тастере XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r [#стубац]"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=[#стубац]"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Поставља тачку јаког прелома на ступцу бр. стубац"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s [програм]"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=[програм]"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Укључује заменску проверу правописа"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Сам чува при излазу, не пита"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Чува датотеку по основи у Јуникс запису"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Режим прегледа (само за читање)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Не прелама јако дуге редове"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Не приказује два реда помоћи"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Укључује обуставу"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Укључује меко преламање редова"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " Гнуов нано, издање %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " © 2014—%s доприносиоци за нано\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Е-пошта: nano@nano-editor.org\tВеб: http://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1959,272 +1979,292 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Нема назива датотеке"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Да сачувам измењену међумеморију?  (Ако одговорите са „Не“ измене ће се "
 "ОДБАЦИТИ.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Нисам уепео да отворим стандардни улаз: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не могу поново да отворим стандардни улаз са тастатуре, извините\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Користите „fg“ да се вратите у нано.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Обустава није укључена"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "искључено"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Развежи тастер"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Несвезиви тастер: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Развежи тастер: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Несвезиви тастер: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Развежи тастер: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Развежи тастер: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Назив тастера „%s“ је неисправан"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Тражена величина табулатора %s је неисправна"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Тражена величина попуне %s је неисправна"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Укуцајте „%s -h“ за списак доступних опција.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Лош регуларни израз „%s“: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Неисправан број реда или ступца"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Грешка у „%s“"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "ДдDdYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "НнNn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "АаАа"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Не"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Све"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Грешка у %s у %zu. реду: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент „%s“ садржи недовршени знак \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Ниске регуларних израза морају почети и завршити се знаком \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Недостаје назив синтаксе"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Неупарени наводник у називу синтаксе"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтакса „none“ је резервисана"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтакса „default“ не прихвата проширења"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Недостаје назив тастера"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Назив тастера је прекратак"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Назив тастера мора почети са ^, M, или F"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Назив тастера „%s“ је неисправан"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Морате навести функцију за коју свезати тастер"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Морате навести изборник (или „all“) у коме свезати/развезати тастер"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не могу да мапирам назив „%s“ ка функцији"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Функција „%s“ не постоји у изборнику „%s“"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Извините, ниска тастера „%s“ не може бити поново свезана"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка ширења „%s“: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Нисам разумео боју „%s“"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Боја позадине не може бити светла"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Наредба „%s“ захтева да јој претходи наредба „syntax“"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Недостаје назив боје"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Недостаје ниска регуларног израза након наредбе „%s“"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Празна ниска регуларног израза"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Синтакса „default“ не прихвата регуларне изразе „%s“"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Недостаје аргумент након „%s“"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Аргументу „%s“ недостаје затварајући \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2232,58 +2272,58 @@ msgstr ""
 "Ако је потребно, користите нано са опцијом „-I“ да дотерате ваша подешавања "
 "нанорц-а.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не могу да нађем синтаксу „%s“ за ширење"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтакса „%s“ нема наредбе боје"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Наредба „%s“ није дозвољена у укљученој датотеци"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Нисам разумео наредбу „%s“"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Недостаје опција"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Непозната опција „%s“"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не могу да расподесим опцију „%s“"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Аргумент није исправна вишебитна ниска"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Потребни су не-празни знаци"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Потребна су два знака једног-ступца"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
 
@@ -2347,238 +2387,251 @@ msgid "No matching bracket"
 msgstr "Нема одговарајуће заграде"
 
 # 48x48/emblems/emblem-marketing.icon.in.h:1
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Постављена ознака"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Поништена ознака"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при покретању „%s“-а"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Напомене нису подржане за ову врсту датотеке"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Не могу да прокоментаришем прошли крај датотеке"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Нема ничега у међумеморији поништавања!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "додавање текста"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "крај реда"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "брисање текста"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "У избору:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "спој реда"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "замена текста"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Измените замену"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "исецање текста"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "поништавање исецања текста"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "уметање текста"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "увлачење"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "поништавање увлачења"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "уметни напомену"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "уклони напомену"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Радња поништавања обављеног (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Ничега за поновно обављање!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Не могу да направим спојку"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Не могу да расцепим"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Нисам уепео да отворим стандардни улаз: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Лоша ниска за цитирање %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Сада могу да „одравнам“!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Поравнава читаву датотеку"
 
-#: src/text.c:2606
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Поравнава текући пасус"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Реч се не може наћи: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Измените замену"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Следећа реч..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Правим списак погрешно унетих речи, сачекајте..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Не могу да добавим величину међумеморије спојке"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Грешка при покретању „spell“-а"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при покретању „sort -f“-а"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Провера правописа није успела: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Провера правописа није успела: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Завршио сам проверу правописа"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Чистач није одређен за ову врсту датотеке!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Да сачувам измењену међумеморију пре чишћења?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Призивам чистача, сачекајте мало"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Добих 0 обрадивих редова од наредбе: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ова порука је за неотворену датотеку „%s“, да је отворим у новој "
 "међумеморији?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "На прву поруку"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "На последњу поруку"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sРечи: %zu  Редова: %zd  Знакова: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "У избору:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Улаз дословности"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Нема даљих поклапања"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Нема поклапања"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "наноу је понестало меморије!"
@@ -2606,76 +2659,81 @@ msgstr "Превише грешака са стандардног улаза"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Непознати низ"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Улаз Уникода: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Измењено"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Ограничени режим"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Будућа упозорења су потиснута"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "ред %zd/%zd (%d%%), стубац %zu/%zu (%d%%), знак %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Уређивач текста нано"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "издање"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Припремили:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Посебно се захваљујемо:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Задужбини слободног софтвера"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "многим преводиоцима и ТП-у"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "За ен-курсис:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "и свима осталима које смо пропустили..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Хвала вам што користите нано!"
 
@@ -2685,9 +2743,18 @@ msgstr "Хвала вам што користите нано!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Недозвољен тастер у не-вишемеђумеморијском режиму"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Не сеци текст"
+
+#~ msgid "Unjustify"
+#~ msgstr "Одравнај"
+
 #~ msgid "WhereIs Next"
 #~ msgstr "Где је слдћи"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Убацује исечак у текући ред"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "Понавља последњу претрагу"
 
@@ -2712,6 +2779,9 @@ msgstr "Хвала вам што користите нано!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Користи још један ред за уређивање"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Глатко клизање"
+
 #~ msgid "Backup files"
 #~ msgstr "Резервне датотеке"
 
@@ -2721,15 +2791,45 @@ msgstr "Хвала вам што користите нано!"
 #~ msgid "No conversion from DOS/Mac format"
 #~ msgstr "Без претварања из Мекинтош/ДОС записа"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Не додаје нове редове на крајеве датотека"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Користи још један ред за уређивање"
+
 #~ msgid "Quoting string"
 #~ msgstr "Ниска за цитирање"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Поставља тачку јаког прелома на ступцу бр. стубац"
+
 #~ msgid "Reading from stdin, ^C to abort\n"
 #~ msgstr "Читам са стандардног улаза, ^C да прекинете\n"
 
 #~ msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 #~ msgstr "Кобна грешка: нема мапираних тастера за функцију „%s“.  Излазим.\n"
 
+#~ msgid "text add"
+#~ msgstr "додавање текста"
+
+#~ msgid "text delete"
+#~ msgstr "брисање текста"
+
+#~ msgid "text cut"
+#~ msgstr "исецање текста"
+
+#~ msgid "text uncut"
+#~ msgstr "поништавање исецања текста"
+
+#~ msgid "text replace"
+#~ msgstr "замена текста"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Лоша ниска за цитирање %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Сада могу да „одравнам“!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Призивам проверу правописа, сачекајте мало"
 
diff --git a/po/sv.po b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.9.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2017-11-20 19:01+0100\n"
 "Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -32,9 +32,9 @@ msgstr "Det går inte att öppna katalog: %s"
 msgid "Go To Directory"
 msgstr "Gå till katalog"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -49,9 +49,9 @@ msgstr "Kan inte gå utanför %s"
 msgid "Can't move up a directory"
 msgstr "Kan inte gå upp en katalog"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fel vid inläsning av %s: %s"
@@ -97,17 +97,17 @@ msgstr "Detta är enda förekomsten"
 msgid "No current search pattern"
 msgstr "Inget aktuellt sökmönster"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Okänt syntaxnamn: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "Misslyckades med magic_load(): %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "Misslyckades med magic_file(%s): %s"
@@ -202,7 +202,7 @@ msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Ny buffert"
 
@@ -306,808 +306,812 @@ msgstr "Fil att infoga [från %s]"
 msgid "File to insert [from %s]"
 msgstr "Fil att infoga [från %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Ogiltig arbetskatalog\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 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:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Ogiltig katalog för säkerhetskopia\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan inte skriva utanför %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fel vid skrivning av säkerhetskopian %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "För många säkerhetskopierade filer?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Skrev %zu rad"
 msgstr[1] "Skrev %zu rader"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Säkerhetskopia]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Infoga markering till fil"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Lägg till markering till fil"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Skriv markering till fil"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Filnamn att infoga i"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Filnamn att lägga till i"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Filnamn att skriva"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr ""
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Filen existerar -- kan inte skriva över"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Filen ”%s” existerar, SKRIVA ÖVER? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Filen har ändrats på disk"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Filen har ändrats sedan du öppnade den; fortsätt spara? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(mer)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Stäng"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Ångra klipp ut text"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Ojustera"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Visa denna hjälptext"
 
-#: src/global.c:541
+#: src/global.c:535
 #, fuzzy
 msgid "Close the current buffer / Exit from nano"
 msgstr "Stäng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:543
+#: src/global.c:537
 #, fuzzy
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:545
+#: src/global.c:539
 #, fuzzy
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Infoga ytterligare en fil i den nuvarande"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Sök framåt efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Sök bakåt efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:551
+#: src/global.c:545
 #, fuzzy
 msgid "Search forward for a string"
 msgstr "Sök efter en sträng"
 
-#: src/global.c:552
+#: src/global.c:546
 #, fuzzy
 msgid "Search backward for a string"
 msgstr "Sök efter en sträng"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Uppdatera fillistan"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Gå till vänstra kolumnen"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Gå till högra kolumnen"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Gå till första raden i denna kolumn"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Gå till sista raden i denna kolumn"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Gå en hel skärm upp"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Gå en hel skärm ned"
 
-#: src/global.c:564
+#: src/global.c:558
 #, fuzzy
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Klipp ut den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Klistra in från urklippsbufferten i aktuell rad"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Visa markörens position"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Ersätt en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Gå till rad- och kolumnnummer"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Markera text med början vid markörpositionen"
 
-#: src/global.c:576
+#: src/global.c:570
 #, fuzzy
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "Kopiera den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:577
+#: src/global.c:571
 #, fuzzy
 msgid "Throw away the current line (or marked region)"
 msgstr "Kommentera/avkommentera aktuell rad eller markerade rader"
 
-#: src/global.c:578
+#: src/global.c:572
 #, fuzzy
 msgid "Indent the current line (or marked lines)"
 msgstr "Kommentera/avkommentera aktuell rad eller markerade rader"
 
-#: src/global.c:579
+#: src/global.c:573
 #, fuzzy
 msgid "Unindent the current line (or marked lines)"
 msgstr "Kommentera/avkommentera aktuell rad eller markerade rader"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Ångra senaste åtgärden"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Gör om den senaste ångraåtgärden"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Gå bakåt ett tecken"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Gå framåt ett tecken"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Gå bakåt ett ord"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Gå framåt ett ord"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Gå till föregående rad"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Gå till nästa rad"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Gå till början på aktuell rad"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Gå till slutet på aktuell rad"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Gå till föregående textblock"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Gå till nästa textblock"
 
 # Biten efter ; är konstig
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå till början på det aktuella stycket; sedan för föregående stycke"
 
 # Biten efter ; är konstig
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå till slutet på det aktuella stycket; sedan för nästa stycke"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Gå till filens första rad"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Gå till filens sista rad"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Gå till den matchande klammern"
 
-#: src/global.c:606
+#: src/global.c:600
 #, fuzzy
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Rulla upp en rad utan att rulla markören"
 
-#: src/global.c:608
+#: src/global.c:602
 #, fuzzy
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Rulla ned en rad utan att rulla markören"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Växla till föregående filbuffert"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Växla till nästa filbuffert"
 
 # Osäker
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Infoga nästa tecken ordagrant"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Infoga ny rad-tecken vid markörpositionen"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Ta bort tecknet under markören"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Ta bort tecknet till vänster om markören"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Klipp ut bakåt från markören till ordets början"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Klipp ut framåt från markören till början på nästa ord"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klipp ut från markörens position till slutet av filen"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Justera det aktuella stycket"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Justera hela filen"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Räkna antalet ord, rader och tecken"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Uppdatera (rita om) den aktuella skärmen"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Försätt redigeraren i vänteläge (om vänteläge är aktiverat)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Försök att komplettera det aktuella ordet"
 
-#: src/global.c:645
+#: src/global.c:639
 #, fuzzy
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Kommentera/avkommentera aktuell rad eller markerade rader"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Spara fil utan att fråga"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Sök nästa förekomst bakåt"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Sök nästa förekomst framåt"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Börja/avsluta inspelning av ett makro"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Kör det senast inspelade makrot"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Växla skiftlägeskänslig sökning"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Vänd riktning för sökningen"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Växla användningen av reguljära uttryck"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Återkalla den föregående sök/ersätt-strängen"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Återkalla nästa sök/ersätt-sträng"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Växla användning av DOS-format"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Växla användning av Mac-format"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Växla inmatning efter"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Växla inmatning före"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Växla säkerhetskopiering av originalfilen"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Kör externt kommando"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:669
 #, fuzzy
 msgid "Do not convert from DOS/Mac format"
 msgstr "Konvertera inte filer från DOS/Mac-format"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Växla användning av en ny buffert"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Stäng buffert utan att spara den"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Gå till filbläddrare"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Avsluta från filbläddraren"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Gå till första filen i listan"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Gå till sista filen i listan"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Gå till föregående fil i listan"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Gå till nästa fil i listan"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Gå till katalog"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Starta felkontrollen, om tillgänglig"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Gå till föregående felkontrmedd"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Gå till nästa felkontrmedd"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Få hjälp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Skriv ut"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Läs fil"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Justera"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Var finns"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Ersätt"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Gå till katalog"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Klipp ut"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "Klipp ut"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Stavkontr."
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Gå till rad"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Ångra"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Gör om"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Skiftkänsl"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Reguljärt uttr"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Bakåt"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Ingen ersättning"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr ""
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr ""
 
 # Osäker
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Fulljstera"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Till klammer"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Spara"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Var fanns"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Bakåt"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Framåt"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Föreg ord"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Nästa ord"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Föreg rad"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Nästa rad"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Föreg block"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Nästa block"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Börj på sty"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Slut på sty"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Föreg sid"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Nästa sid"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Första raden"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Sista raden"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Föregående fil"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Nästa fil"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backsteg"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Ta bort"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Klipp vänster"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Klipp höger"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Ordagrann"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Vänteläge"
 
-#: src/global.c:973
+#: src/global.c:978
 #, fuzzy
 msgid "Indent"
 msgstr "indrag"
 
-#: src/global.c:975
+#: src/global.c:980
 #, fuzzy
 msgid "Unindent"
 msgstr "Ångra indragning"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Kommentera rader"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Komplettera"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Spela in"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Kör makro"
 
-#: src/global.c:992
+#: src/global.c:997
 #, fuzzy
 msgid "Zap Text"
 msgstr "Markera text"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Till felkontrollsverktyg"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Spara"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Gå till text"
@@ -1189,59 +1193,60 @@ msgstr "Nästa felkontrollsmed"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Hjälpläge"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Konstant visning av markörposition"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Mjuk rullning"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Rulla efter rad istället för halvskärm"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Mjuk radbrytning av långa rader"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Visning av blanktecken"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Färgmarkering av syntax"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Fast radbrytning av långa rader"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Musstöd"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Vänteläge"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Radnumrering"
 
@@ -1611,19 +1616,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Fel vid skrivning av %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Tangenten ogiltig i visningsläget"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Funktionen är inaktiverad i begränsat läge"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Hjälp är inte tillgängligt"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1632,7 +1637,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs till %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1641,7 +1646,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte till %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1650,7 +1655,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1661,7 +1666,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1670,7 +1675,7 @@ msgstr ""
 "För att placera markören på en specifik rad i en fil, ange radnummer med\n"
 "ett ”+” före filnamnet. Kolumnnumret kan sedan läggas till efter ett komma.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1679,285 +1684,300 @@ msgstr ""
 "När ett filnamn är ”-” läser nano data från standard in.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Flagga\t\tLång GNU-flagga\t\tBetydelse\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Aktivera smart hemtangent"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Spara säkerhetskopior av befintliga filer"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Katalog för att spara unika säkerhetskopior"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Använd fet stil istället för omvänd videotext"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Konvertera angivna tabulatorer till blanksteg"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Läs en fil till en ny buffert som standard"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Använd låsfiler (i vim-stil)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Logga och läs stränghistorik för sök/ersätt"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Titta inte i nanorc-filer"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Gå till första raden i denna kolumn"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Ta hand om förvirringsproblemet med numeriska tangentbordet"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Lägg inte till nya rader på slutet av filer"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr ""
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertera inte filer från DOS/Mac-format"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Använd en rad till för redigering"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Logga & läs plats för markörposition"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "-Q <regex>"
 msgstr "-Q <str>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 #, fuzzy
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 #, fuzzy
 msgid "Regular expression to match quoting"
 msgstr "Sök med reguljärt uttryck"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Begränsat läge"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Rulla efter rad istället för halvskärm"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <kolumner>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<kolumner>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Ställ in bredden på ett tabbsteg till antal kolumner"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Gör en snabb rensning av statusraden"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Identifiera ordgränsen mer noggrant"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <str>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<str>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Vilka andra tecken är orddelar"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <name>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<name>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaxdefinition att använda för färger"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr ""
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Radbryt vid mellanslag"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Använd inte fast radbryt för långa rader"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Visa markörposition hela tiden"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fixa förvirringsproblemet med Backsteg/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 #, fuzzy
 msgid "Show cursor in file browser & help text"
 msgstr "Visa markör i filbläddraren"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Visa denna hjälptext och avsluta"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Dra automatiskt in nya rader"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Klipp ut från markören till slutet på raden"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Visa radnummer före texten"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Aktivera användning av musen"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Läs inte filen (skriv den bara)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Ställ in arbetskatalog"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Bevara XON (^Q)- och XOFF (^S)-tangenter"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <kolumner>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<kolumner>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Ställ in fast radbryt-punkt vid kolumnen #cols"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Använd alternativ stavningskontroll"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Spara automatiskt vid avslut, fråga inte"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Spara som standard en fil i Unix-format"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Visningsläge (skrivskyddat)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Använd inte fast radbryt för långa rader"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Visa inte de två hjälpraderna"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Använd vänteläge"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Aktivera mjuk radbrytning"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, version %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s nanos skapare\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHemsida: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1966,272 +1986,292 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Inget filnamn"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Spara ändrad buffert? (Att svara \"Nej\" kommer att FÖRKASTA ändringar.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Misslyckades med att öppna stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunde inte återöppna stdin från tangentbordet\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Vänteläge är inte aktiverat"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Obunden tangent"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Obindbar tangent:M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Obunden tangent:M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Obindbar tangent:M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Obunden tangent:^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Obunden tangent:%c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Tangentnamnet \"%s\" är ogiltigt"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Ogiltigt rad- eller kolumnnummer"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Misstag i ”%s”"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr ""
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Nej"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Alla"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, fuzzy, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Fel i %s på rad %lu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 #, fuzzy
 msgid "Unpaired quote in syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaxen \"none\" är reserverad"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Syntaxen \"default\" accepterar inte utökningar"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Saknar tangentnamn"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Tangentnamnet är för kort"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tangentnamnet måste börja med ”^”, ”M” eller ”F”"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Tangentnamnet \"%s\" är ogiltigt"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Måste ange en funktion att binda tangenten till"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 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:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan inte mappa namnet ”%s” till en funktion"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan inte mappa namnet ”%s” till en meny"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktionen ”%s”  existerar inte i meny ”%s”"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "Keystroke %s may not be rebound"
 msgstr "Tangentnedtryckningen ”%s” kan inte bindas om"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fel vid utökning av %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, fuzzy, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "En bakgrundsfärg kan inte vara ljus"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Ett ”%s”-kommando kräver ett föregående ”syntax”-kommando"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Saknar regex-sträng efter ”%s”-kommando"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Tom sträng för reguljärt uttryck"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kräver ett motsvarande \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Syntaxen \"default\" accepterar inte reguljära uttryck som ”%s”"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Saknar argument efter ”%s”"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2239,58 +2279,58 @@ msgstr ""
 "Om det behövs, använd nano med flaggan -I för att justera dina nanorc-"
 "inställningar.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunde inte hitta syntax %s att utöka"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Saknad flagga"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Okänd flagga \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan inte bort flaggan \"%s\""
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argument är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
@@ -2352,236 +2392,249 @@ msgstr "Inte en klammer"
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Markering satt"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Markera borttagen"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Kommentarer stöds inte för denna filtyp"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Kan inte kommentera bortom filavslutet"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Inget i ångra-bufferten!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "lägg till text"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "radbryt"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "textborttagning"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "I markering:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "lägg ihop rad"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "textersättning"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Redigera en ersättning"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr ""
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "klipp ut text"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "ångra klipp ut text"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "textinmatning"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
+msgstr "Riktning"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "indrag"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "Ångra indragning"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "kommentera"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "avkommentera"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Ångrade åtgärd (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Inget att göra om!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Gjorde om åtgärd (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Kunde inte skapa rör"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr ""
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, fuzzy, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Misslyckades med att öppna stdin: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Felaktig citeringssträng %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Kan ojustera nu!"
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Justera hela filen"
+
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Justera det aktuella stycket"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Ord kan inte hittas: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Redigera en ersättning"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Nästa ord…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Skapar lista över felstavade ord, var vänlig vänta…"
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde inte få tag i rörbuffertens storlek"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Fel vid start av \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Fel vid start av \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Ingen felkontroll definierad för denna typ av fil!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Spara ändrad buffert före felkontroll?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Startar felkontroll, vänta."
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fick 0 tolkningsbara rader från kommando: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr ""
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Vid första meddelandet"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Vid sista meddelandet"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, fuzzy, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Ordagrann inmatning"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr ""
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Inga fler träffar"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Inga matchningar"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 #, fuzzy
 msgid "Nano is out of memory!\n"
 msgstr "nano har slut på minne!"
@@ -2609,76 +2662,81 @@ msgstr "För många fel från stdin"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Okänd sekvens"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode-inmatning:%s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr ""
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Ändrad"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Visa"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Begränsat läge"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Ytterligare varningar doldes"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, fuzzy, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%lu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "de många översättarna och TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "För ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "och alla andra som vi har glömt…"
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Tack för att du använder nano!"
 
@@ -2688,12 +2746,21 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Tangenten ogiltig i icke-flerbuffertläget"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Ångra klipp ut text"
+
+#~ msgid "Unjustify"
+#~ msgstr "Ojustera"
+
 #~ msgid "WhereIs Next"
 #~ msgstr "VarFinnsNäst"
 
 #~ msgid "Exit from nano"
 #~ msgstr "Avsluta nano"
 
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Klistra in från urklippsbufferten i aktuell rad"
+
 #~ msgid "Repeat the last search"
 #~ msgstr "Upprepa senaste sökning"
 
@@ -2724,6 +2791,9 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Use of one more line for editing"
 #~ msgstr "Användning av ytterligare en rad för redigering"
 
+#~ msgid "Smooth scrolling"
+#~ msgstr "Mjuk rullning"
+
 #~ msgid "Backup files"
 #~ msgstr "Säkerhetskopiera filer"
 
@@ -2733,9 +2803,18 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "No conversion from DOS/Mac format"
 #~ msgstr "Ingen konvertering från DOS/Mac-format"
 
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Lägg inte till nya rader på slutet av filer"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Använd en rad till för redigering"
+
 #~ msgid "Quoting string"
 #~ msgstr "Citatsträng"
 
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Ställ in fast radbryt-punkt vid kolumnen #cols"
+
 #~ msgid "Reading from stdin, ^C to abort\n"
 #~ msgstr "Läser från stdin, ^C för att avbryta\n"
 
@@ -2762,6 +2841,30 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Can unindent only by a full tab size"
 #~ msgstr "Kan endast avindentera med hel tabbstorlek"
 
+#~ msgid "text add"
+#~ msgstr "lägg till text"
+
+#~ msgid "text delete"
+#~ msgstr "textborttagning"
+
+#~ msgid "text cut"
+#~ msgstr "klipp ut text"
+
+#~ msgid "text uncut"
+#~ msgstr "ångra klipp ut text"
+
+#~ msgid "text insert"
+#~ msgstr "textinmatning"
+
+#~ msgid "text replace"
+#~ msgstr "textersättning"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Felaktig citeringssträng %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Kan ojustera nu!"
+
 #~ msgid "Invoking spell checker, please wait"
 #~ msgstr "Starta stavningskontrollen"
 
@@ -3006,9 +3109,6 @@ msgstr "Tack för att du använder nano!"
 #~ "\n"
 #~ "Tryck Retur för att fortsätta starta nano\n"
 
-#~ msgid "Direction"
-#~ msgstr "Riktning"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Hitta andra klammern"
 
diff --git a/po/tr.po b/po/tr.po
@@ -2,14 +2,14 @@
 # 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.
-# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017, 2018.
+# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017, 2018, 2019.
 # Volkan Gezer <volkangezer@gmail.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-3.2-pre1\n"
+"Project-Id-Version: nano-4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-06 14:42+0300\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-11 16:35+0300\n"
 "Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "Language: tr\n"
@@ -30,9 +30,9 @@ msgstr "Dizin açılamıyor: %s"
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "İptal edildi"
 
@@ -47,9 +47,9 @@ msgstr "%s dışına çıkamazsın"
 msgid "Can't move up a directory"
 msgstr "Bir üst dizine geçilemiyor"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Okuma hatası %s: %s"
@@ -95,17 +95,17 @@ msgstr "Bu tek olaydır"
 msgid "No current search pattern"
 msgstr "Geçerli bir arama deseni yok"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Bilinmeyen sözdizimi adı: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() hatalı: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) hatalı: %s"
@@ -197,7 +197,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu satırları (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
@@ -296,788 +296,786 @@ msgstr "[%s tarafından] dönüştürülmemiş eklenecek dosya"
 msgid "File to insert [from %s]"
 msgstr "Eklenecek dosya [%s tarafından]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Geçersiz işletim dizini\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Geçersiz işletim dizini: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Yedek dosya yazımı başarısız; kaydetmeye devam edecek misiniz? (Emin "
 "değilsen H deyin.) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Geçersiz yedek dizini\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Geçersiz yedek dizini: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s'in dışına yazılamaz"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "%s yedek dosyası yazılırken hata oluştu: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Çok fazla yedek dosyası?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Geçici dosya yazarken hata oluştu: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Yazma hatası %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "%zu satır yazıldı"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS Biçimi]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac Biçimi]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Yedek]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Seçimi Dosyanın Başına Ekle"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Seçimi Dosyaya Yaz"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Başına Eklenecek Dosya Adı"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Sonuna Eklenecek Dosya Adı"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Yazılacak Dosya Adı"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Çok küçük"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Dosya mevcut -- üzerine yazılamıyor"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Dosyayı FARKLI İSİMDE kaydet? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "\"%s\" dosyası mevcut; ÜZERİNE YAZ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Disk üzerindeki dosya değişmiştir"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Dosya açtığınızdan bu yana değiştirilmiş, kayda devam et? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(daha)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Çık"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Kapat"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Metni Kesme"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "Düzeni Kaldır"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Bu yardım metnini göster"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Geçerli dosya tamponunu kapat / Nanodan çık"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Geçerli tamponu (veya işaretli bölgeyi) diske yazın"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Geçerli arabelleğe (veya yeni arabelleğe) başka bir dosya ekleyin"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Bir dize veya normal ifade için ileriye doğru arama"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Bir dize veya bir düzenli ifade için geriye doğru arama"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Bir dize için ileri arama"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Bir dize için geri arama"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Dosya listesini yenile"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Sol sütuna geç"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Sağ sütuna geç"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Bu sütundaki ilk satıra git"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Bu sütundaki son satıra git"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Bir ekran yukarı git"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Bir ekran aşağı git"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Mevcut satırı kesin (veya işaretli bölge) ve kesme arabelleğinde saklayın"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Şu anki satıra kesim arabelleğini yapıştır"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Kesme imlecinin içeriğini geçerli imleç konumuna yapıştırın"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "İmlecin konumunu göster"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Yazım denetleyicisini çağır, eğer mümkün ise"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Bir dizgi ya da düzenli ifadeyi değiştir"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Satır ve sütun numarasına git"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "İmleç konumundan başlayan metni işaretle"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Geçerli satırı (veya işaretli bölge) kopyalayıp kesme arabelleğinde saklayın"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Mevcut çizgiyi (veya işaretli bölgeyi) atın"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Geçerli satıra (veya işaretli satırlara) girinti yapın"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Geçerli satırı (veya işaretli satırları) kaldırın"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Son işlemi geri al"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Son geri alınan işlemi yeniden yap"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Bir karakter geri git"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Bir karakter ileri git"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Bir kelime geri git"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Bir kelime ileri git"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Önceki satıra git"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Sonraki satıra git"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Geçerli satırın başına git"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Geçerli satırın sonuna git"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Önceki metin bloğuna git"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Sonraki metin bloğuna git"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Paragrafın başına ve ardından önceki paragrafın başına git"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Paragrafın sonuna ve ardından sonraki paragrafın sonuna git"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Eşleşen paranteze git"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "İmleci metinsel olarak hareket ettirmeden bir satır yukarı kaydır"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "İmleci metinsel olarak hareket ettirmeden bir satır aşağı kaydır"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Bir önceki dosya arabelleğine geç"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Sonraki dosya tamponuna geç"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Sonraki tuş vuruşunu birebir ekle"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "İmleç konumunu bir sekme ekle"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "İmleç konumuna yeni bir satır ekle"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "İmlecin altındaki karakteri sil"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "İmlecin solundaki karakteri sil"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "İmleçten kelime başlangıcına kadar kes"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "İmleçten sözcük başlangıcına geriye doğru sil"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "İmleçten sonraki kelime başlangıcına kadar ileri kes"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Bir sonraki kelimyi başlatmak için imleci ileriye doğru sil"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "İmleç yerinden dosyanın sonuna kadar kes"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Dosyanın tamamını yasla"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Kelimeleri, satırları ve karakterleri say"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Şu anki ekranı tazele (yeniden çiz)"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Düzenleyiciyi askıya al (askıya alma etkinse)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Geçerli kelimeyi tamamlamayı dene"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Geçerli satırı (veya işaretli satırları) yorumlama/yorumlamama"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Dosyayı sormadan kaydet"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Geriye doğru sonrakini ara"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Sonrakini ileri ara"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Bir makro kaydını başlat/durdur"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Son kaydedilen makro çalıştırma"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Büyük/küçük harfe duyarlı arama seçimi"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Arama yönünü tersine çevir"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Düzenli ifade kullanımını aç/kapat"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini geri çağır"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Sonraki arama/değiştirme dizgisini geri çağır"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "DOS biçiminin kullanımını değiştir"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Mac biçiminin kullanımını değiştir"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Eklemeyi aç/kapat"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Öne eklemeyi aç/kapat"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Özgün dosyanın yedeklenmesini aç/kapat"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Harici komut çalıştır"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Geçerli tamponu (veya işaretli bölgeyi) komuta yöneltin"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Dosyaları DOS/Mac biçiminden dönüştürme"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Yeni bir tampon kullanımını aç/kapat"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Tamponu kaydetmeden kapat"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Dosya yöneticisinden çık"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Listedeki ilk dosyaya git"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Listedeki son dosyaya git"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Listedeki önceki dosyaya git"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Listedeki sonraki dosyaya git"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Dizine git"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Linter mevcutsa uygula"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Bir önceki linter mesajına git"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Bir sonraki linter mesajına git"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Yardım Al"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Yaz"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Dosya Oku"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Yasla"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Tazele"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Ara"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Değiştir"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Dizine Git"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Metni Kes"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Metni Yapıştır"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Denetime"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Satıra Git"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Geri Al"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Yinele"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Metni İşaretle"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Metni Kopyala"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "Harf Duyarlı"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "Düzenli İfade"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Geriye Doğru"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Değiştirme Yok"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Daha eski"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Daha yeni"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "İki Yana Yaslama"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Paranteze"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Kaydet"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Neredeydi"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Önceki"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Sonraki"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "İleri"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Sonraki Kelime"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Önceki Satır"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Sonraki Satır"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Yukarı Kaydır"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Aşağı Kaydır"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Önceki Blok"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Sonraki Blok"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Par Başına"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Par Sonuna"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Önceki Sayfa"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "İlk Satır"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Son Satır"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Sekme"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Gir Tuşu"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Geri tuşu"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Sil"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Sola Kes"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Sola Kırp"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Sağa Kes"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Sağa Kırp"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "SonaKadarKes"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Kelime Sayısı"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Birebir"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Askıya Al"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Girinti"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Girintiyi kaldır"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Satırları Yorumla"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Tamam"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Kayıt"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Makro çalıştır"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Zap Metni"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "Linter'a"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Kaydet"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Yazıya Git"
@@ -1157,59 +1155,59 @@ msgstr "Sonraki Lint Msj"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu gösterimi"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Yumuşak kaydırma"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Hızlı kaydırma (her yarım ekran başına)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Uzun satırların yumuşak kaydırılması"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Boşluk göster"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Akıllı ev tuşu"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Uzun satırların katı kaydırılması"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Sekmelerin boşluğa dönüşümü"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Fare Desteği"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Askıya al"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Satır numaralandırma"
 
@@ -1457,6 +1455,8 @@ msgid ""
 "If you just need another blank buffer, do not enter any command.\n"
 "\n"
 msgstr ""
+"Sadece başka bir boş arabellek gerekiyorsa, herhangi bir komut girmeyin.\n"
+"\n"
 
 #: src/help.c:414
 msgid ""
@@ -1576,19 +1576,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "%s yazarken hata: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Tuş görünüm kipinde geçersizdir"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Bu fonksiyon kısıtlı kipte geçersizdir"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Yardım kullanılabilir değil"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1597,7 +1597,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1606,7 +1606,7 @@ msgstr ""
 "\n"
 "Arabellek %s'ye yazılamadı: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1615,7 +1615,7 @@ msgstr ""
 "\n"
 "Arabellek yazılamadı: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1626,7 +1626,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1636,7 +1636,7 @@ msgstr ""
 "dosya adından\n"
 "önce '+' ile koyun.  Sütun numarası bir virgülden sonra eklenebilir.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1645,281 +1645,293 @@ msgstr ""
 "Nezaman bir dosya adı '-', nano veriyi standart girdiden okur.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Seçenek\t\tGNU uzun seçenek\t\tAnlamı\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Akıllı ev tuşunu etkinleştir"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Var olan dosyaların yedeklerini kaydet"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Benzersiz yedek dosyalarını kaydetmek için dizin"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Ters video metni yerine kalın kullan"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Yazılan sekmeleri boşluklara dönüştür"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Varsayılan olarak dosyayı yeni bir tampona oku"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Kilit dosyaları (vim biçemi) kullan"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Metin arama/değiştirme geçmişini oku & günlükle"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "nanorc dosyalarına bakma"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Bu sütunda bir kılavuz çubuk göster"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Sayısal tuş karmaşıklığı sorununu çöz"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Dosya sonlarına yeni satırlar ekleme"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Otomatik bir yeni satır eklemeyin [varsayılan]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Sabit-sarma yaparken kuyruk boşluklarını kırp"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Dosyalaro DOS/Mac biçiminden dönüştürme"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Düzenlemek için bir satır daha kullan"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "İmleç konumunun konumunu tut ve oku"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <regex>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<regex>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Alıntıyı eşleştirmek için normal ifade"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Sınırlı mod"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Yarım ekran yerine satır kaydır"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Bir sekme genişliğini #süt sütuna ayarla"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Hızlı durum çubuğu boşaltması yap"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Sürüm bilgisini yaz ve çık"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Kelime sınırlarını daha isabetli algıla"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <dizge>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<dizge>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Hangi diğer karakterler kelime bölümleri"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <isim>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<isim>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Renklendirmek için sözdizimi tanımı"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "BSP ve Del'in işaretli bir bölgeyi silmesine izin ver"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Ne zaman yumuşak-kaydırma, onu boşluk yap"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Otomatik olarak hard-wrap uzun çizgiler"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "İmleç pozisyonunu daimi göster"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Backspace/Delete karışıklığını düzelt"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Satır çubuğunun altındaki satırı boş bırak"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Metnin yeni bir satırla bitmesini sağlayın"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "İmleci dosya tarayıcısına ve yardım metninde göster"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Bu yardım metnini göster ve çık"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Yeni satırlarda otomatik paragraf başı yap"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Satır başına değil, yarım ekran başına kaydırma"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "İmlecin bulunduğu yerden satır sonuna kadar kes"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Metnin önünde satır numaralarını göster"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Fare kullanımı etkin"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Dosyayı okuma (sadece yaz)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Çalışma dizinini belirle"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) ve XOFF (^S) tuşlarını sakla"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "#süt sütununda sabit kaydırma noktası ayarla"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Hard-wrap ve iki yana yaslama için genişliği ayarlayın"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Alternatif yazım kontrolcüsü etkin"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Çıkışta sormaksızın otomatik kaydet"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Dosyayı varsayılan olarak Unix biçiminde kaydet"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Görünüm modu (salt okunur)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Uzun satırları zorla kaydırma"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Uzun çizgileri hard-wrap yapmayın [varsayılan]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "İki yardım satırını gösterme"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Sağ kelime bitiminde durdurur"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Asıkya alma aktif"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Yumuşak satır kaydırmayı etkinleştir"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, sürüm %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s nano katkıcıları\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " E-posta: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1928,272 +1940,291 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Dosya adı yok"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr ""
 "Değiştirilen tampon kaydeidlsin mi?  (\"Hayır\" demek değişiklikleri "
 "SİLECEK.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Standart girdiden okuma; bitirmek için ^D veya ^D^D yazın.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Açılma hatası stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "stdin klavyeden yeniden açılamadı, üzgünüz\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Özür dileriz! Nano çöktü!  Kod: %d.  Lütfen bir hata bildirin.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Nanoya geri dönmek için \"fg\" tkullan.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Askıya alma etkin değil"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Tuş atamasını kaldır"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Atama kaldırılamaz tuş: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Tuş atamasını kaldır: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Bağlanamaz anahtarı: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Tuş atamasını kaldır: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Tuş atamasını kaldır: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Kılavuz sütunu \"%s\" geçersizdir"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Seçenek %s dikkate alınmaz; bu varsayılandır\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "İstenen sekme boyutu \"%s\" geçersiz"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri \"%s\" geçerli değil"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Kullanılabilir seçeneklerin bir listesi için '%s -h' yazın.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Kötü alıntı regex \"%s\": %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Geçersiz satır veya sütun numarası"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "'%s' olarak hatalar"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Nano'ya hoşgeldiniz.  Temel yardım için Ctrl+G tuşlarına basın."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Ee"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Hh"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Evet"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Hayır"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Tümü"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Error in %s on line %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argümanı sonlandırılmamış bir \" içeriyor"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Düzenli ifade satırları \" işareti ile başlamak ve bitmek zorundadır"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kötü düzenli i̇fade \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Sözdizimi adında eşleşmeyen alıntı"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sözdizimi ayrılmış"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "\"default\" sözdizimi uzantıları kabul etmiyor"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Eksik anahtar adı"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Tuş adı çok kısa"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tuş adı şunlarla başlamalı \"^\", \"M\", veya \"F\""
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Tuş adı %s geçersiz"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Anahtarın bağlayacağı bir işlev belirtmeli"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "Anahtarın bağlanacağı/kaldırılacağı bir menü (veya \"all\") belirtmeli"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "\"%s\" adı bir işleve eşlenemiyor"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "\"%s\" adı bir menüye eşlenemiyor"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "'%s' fonksiyonu '%s' menüsünde yok"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Üzgünüz, \"%s\" tuş vuruşu tekrar atanamayabilir"
+msgid "Keystroke %s may not be rebound"
+msgstr "Tuş vuruşu %s ribaunt olmayabilir"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "%s genişletilirken hata: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Renk \"%s\" anlaşılmadı"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Bir arka plan rengi parlak olamaz"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Bir '%s' komutu öncesinde bir 'sözdizimi' komutu gerektirir"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "'%s' komutundan sonra düzenli ifade eksik"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Boş düzenli ifade dizgisi"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "\"Varsayılan\" sözdizimi '%s' regexes kabul etmez"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "'%s' sonrasında eksik değişken"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Bağımsız değişken '%s' kapanma eksikliği \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "Hiçbir anahtar '%s' menüsünde '%s' işlevine bağlı değildir. Çıkıyor.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2201,58 +2232,58 @@ msgstr ""
 "Gerekirse, nano ile -I seçeneğini kullanın nanorc ayarlarınızı belirlemek "
 "için.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Sözdizimi genişletmek için \"%s\" bulunamadı"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sözdizimi \"%s\" renk komutlarına sahip değildir"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Dosyada \"%s\" komutunun kullanımına izin verilmiyor"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "\"%s\" komutu anlaşılamadı"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Eksik seçenek"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Bilinmeyen seçenek \"%s\""
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "\"%s\" seçeneği silinemiyor"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" seçeneği bir bağımsız değişkene ihtiyaç duyuyor"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Argüman geçerli bir çokbaytlı dizge değil"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Boş olmayan karakter gerekli"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "İki tek sütün karakter gerekli"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!  Vay canına!"
 
@@ -2313,237 +2344,245 @@ msgstr "Ayraç değil"
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "İşaretle"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Metni İşaretleme"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"%s\" çağrılmasında hata"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Yorumlama bu dosya türü için desteklenmiyor"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Dosyanın sonundan sonra yorum yapılamaz"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Geri al tamponu boş!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "metin ekleme"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "addition"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "satır sonu"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "metin silme"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "silme"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "satırı birleştir"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "metni değiştir"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "değiştirme"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "silinti"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "metin kesme"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "kes"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "metin kesmesi iptal"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "yapıştır"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "metin ekle"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "yön"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "girinti"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "Girintisini kaldır"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "yorumla"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "yorumu kaldır"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Eylem geri alındı (%s)"
+msgid "Undid %s"
+msgstr "Geri alındı %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Yeniden yapılacak hiçbir şey yok!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Eylem geri alındı (%s)"
+msgid "Redid %s"
+msgstr "Yeniden yapıldı %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Boru yaratılamadı"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "filtreleme"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Hat açılamadı: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Hatalı alıntı dizgesi %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "iki yana yaslama"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Şmdi yaslamayı geri alabilirsiniz!"
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Seçim iki yana yaslandı"
 
-#: src/text.c:2606
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Dosyayı iki yana yasla"
+
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Paragrafı iki yana yasla"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Ulaşılamıyan kelime: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Bir yerdeğiştirmeyi düzenle"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Sonraki kelime..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" çağırılırken hata"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Bu dosya türü için tanımlanmış hiçbir linter yok!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Haddelenmeden önce değiştirilmiş arabellek kaydedilsin mi?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Linter çağırma, lütfen bekleyin"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Komuttan 0 ayrıştırılabilir satırlar var: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Bu mesaj için %s açılmamış dosyası, yeni bir arabellekte mi onu açalım?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Bu dosya için mesaj yok"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "İlk mesajda"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Son mesajda"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sKelimeler: %zu  Satırlar: %zd  Karakterler: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Seçimde:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Birebir Girdi"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Sözcük parçası yok"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Başka eşleşme yok"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Eşleşme yok"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano bellek dışı!\n"
 
@@ -2569,79 +2608,128 @@ msgstr "stdin den çok sayıda hata\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Bilinmeyen sıralama"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode giriş: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Linting --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Değiştirildi"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Görünüm"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Kısıtlanmış"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Diğer uyarılar bastırıldı"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "satır %zd/%zd (%d%%), sütun %zu/%zu (%d%%), karakter %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Nano metin düzenleyicisi"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "sürüm"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Size sağlayan:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "Birçok çevirmen ve TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuğumuz kişilere..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Nano'yu kullandığınız için teşekkür ederiz!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Metni Kesme"
+
+#~ msgid "Unjustify"
+#~ msgstr "Düzeni Kaldır"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Şu anki satıra kesim arabelleğini yapıştır"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Yumuşak kaydırma"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Dosya sonlarına yeni satırlar ekleme"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Düzenlemek için bir satır daha kullan"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "#süt sütununda sabit kaydırma noktası ayarla"
+
+#~ msgid "text add"
+#~ msgstr "metin ekleme"
+
+#~ msgid "text delete"
+#~ msgstr "metin silme"
+
+#~ msgid "text replace"
+#~ msgstr "metni değiştir"
+
+#~ msgid "text cut"
+#~ msgstr "metin kesme"
+
+#~ msgid "text uncut"
+#~ msgstr "metin kesmesi iptal"
+
+#~ msgid "text insert"
+#~ msgstr "metin ekle"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Hatalı alıntı dizgesi %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Şmdi yaslamayı geri alabilirsiniz!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Anahtar çoklu olmayan arabellek kipinde geçersiz"
 
@@ -2899,9 +2987,6 @@ msgstr "Nano'yu kullandığınız için teşekkür ederiz!"
 #~ msgid "Find Other Bracket"
 #~ msgstr "Diğer Köşeli Ayracı Bul"
 
-#~ msgid "Direction"
-#~ msgstr "Yön"
-
 #~ msgid "Window size is too small for nano...\n"
 #~ msgstr "Pencere boyutu nano için çok küçük...\n"
 
diff --git a/po/uk.po b/po/uk.po
@@ -3,15 +3,15 @@
 # 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, 2016, 2017, 2018.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015, 2016, 2017, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-05 22:26+0200\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-11 14:30+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\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 2.0\n"
+"X-Generator: Lokalize 19.03.70\n"
 
 #: src/browser.c:67
 #, c-format
@@ -31,9 +31,9 @@ msgstr "Не вдалося відкрити каталог: %s"
 msgid "Go To Directory"
 msgstr "Перейти до каталогу"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Скасовано"
 
@@ -48,9 +48,9 @@ msgstr "Не можу вийти за межі %s"
 msgid "Can't move up a directory"
 msgstr "Не можу перейти на каталог вище"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Помилка під час спроби читання %s: %s"
@@ -97,17 +97,17 @@ msgstr "Це єдиний збіг"
 msgid "No current search pattern"
 msgstr "Немає поточного зразка для пошуку"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Невідома назва синтаксису: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "Помилка magic_load(): %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "Помилка magic_file(%s): %s"
@@ -205,7 +205,7 @@ msgstr[0] "%s -- %zu рядок (%s)"
 msgstr[1] "%s -- %zu рядки (%s)"
 msgstr[2] "%s -- %zu рядків (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Новий Буфер"
 
@@ -314,48 +314,50 @@ msgstr "Файл для вставляння без перетворення [в
 msgid "File to insert [from %s]"
 msgstr "Файл для вставляння [від %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "Некоректний робочий каталог\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "Некоректний робочий каталог: %s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Не вдалося записати дані до файла резервної копії, продовжити спробу "
 "зберегти дані? (Натисніть N, якщо не певні.) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "Некоректний резервний каталог\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "Некоректний резервний каталог: %s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Не можу записати поза %s"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Помилка під час спроби записати до файла резервної копії %s: %s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Забагато файлів резервних копій?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Помилка під час спроби записати до тимчасового файла: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Помилка під час спроби записати %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
@@ -363,743 +365,739 @@ msgstr[0] "Записано %zu рядок"
 msgstr[1] "Записано %zu рядки"
 msgstr[2] "Записано %zu рядків"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Резерв]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Дописати позначене до файла на початку"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Дописати позначене до файла наприкінці"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Записати позначене до файла"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Назва файла для дописування"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Назва файла для дописування"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Назва файла для записування"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Замалий"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Файл вже існує - перезапис неможливий"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Зберегти файл з ІНШОЮ НАЗВОЮ? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Файл «%s» вже існує, ПЕРЕЗАПИСАТИ? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Файл змінено на диску"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr ""
 "З часу, коли було відкрито файл, до нього було внесено зміни. Продовжити "
 "спроби зберегти дані? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(далі)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Закрити"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "СкасВиріз"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Скасувати поточну функцію"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Показати цю довідку"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Закрити поточний буфер / Вийти з nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Записати поточний буфер (або позначену область) до файла"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "Вставити інший файл до поточного буфера (або до нового буфера)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Шукати рядок або формальний вираз далі за текстом"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Шукати рядок або формальний вираз у напрямку до початку тексту"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Шукати рядок далі"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Шукати рядок раніше"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Освіжити список файлів"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Перейти до стовпчика ліворуч"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Перейти до стовпчика праворуч"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Перейти до першого рядка у цьому стовпчику"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Перейти до останнього рядка у цьому стовпчику"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "На один екран вгору"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "На один екран вниз"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Вирізати поточний рядок (або позначену область) і помістити його до «кишені»"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Скасувати вирізання та вставити зміст \"кишені\" до поточного рядка"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Вставити вміст буфера вирізання до місця розташування курсора"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Показати розташування курсора"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "Викликати програму пошуку друкарських помилок (якщо є)"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "Замінити рядок або формальний вираз"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "Перейти до рядка і позиції"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "Позначити текст, починаючи з поточної позиції курсора"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Скопіювати поточний рядок (або позначену область) і зберегти його до «кишені»"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Викинути поточний рядок (або позначену ділянку)"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Додати відступ у поточному рядку (або позначених рядках)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Вилучити відступ для поточного рядка (або позначених рядків)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Скасувати останню дію"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Відновити останню скасовану дію"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Назад на один символ"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Вперед на один символ"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Назад на одне слово"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Вперед на одне слово"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Повернутися до попереднього рядка"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Перейти до наступного рядка"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Перейти до початку рядка"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Перейти до кінця рядка"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Повернутися до попереднього блоку тексту"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Перейти до наступного блоку тексту"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "На початок поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "У кінець поточного абзацу; потім наступного абзацу"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Перейти до першого рядка файла"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Перейти до останнього рядка файла"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Перейти до відповідної дужки"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Гортати на один рядок вгору без переміщення курсора"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Гортати на один рядок вниз без переміщення курсора"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Перемкнутися на попередній файловий буфер"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Перемкнутися на наступний файловий буфер"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Вставити наступну комбінацію клавіш як є"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Вставити знак табуляції в місце розташування курсора"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "Вставити новий рядок у місці розташування курсора"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Видалити літеру під курсором"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Видалити літеру зліва від курсора"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "Вирізати назад від курсора до початку слова"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "Вилучити назад від курсора до початку слова"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "Вирізати вперед від курсора до початку слова"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "Вилучити вперед від курсора до початку слова"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вирізати від позиції курсора до кінця файла"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Вирівняти поточний абзац"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Вирівняти цілий файл"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Підрахувати кількість слів, рядків та символів"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Перемалювати поточний екран"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Призупинити редактор (якщо увімкнено призупинення)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Спробувати доповнити поточне слово"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Додати/Зняти коментування поточного рядка (або позначених рядків)"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Зберегти файл без запитань"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Шукати відповідник у напрямку до початку"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Шукати відповідник у напрямку до кінця"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Почати/Припинити запис макросу"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Виконати останній записаний макрос"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Увімкнути/вимкнути чутливість пошуку до регістру"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Змінити напрямок пошуку на протилежний"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "Увімкнути/вимкнути використання формальних виразів"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Згадати попередній рядок пошуку/заміни"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Згадати наступний рядок пошуку/заміни"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "Увімкнути/вимкнути використання формату DOS"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "Увімкнути/вимкнути використання формату Mac"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Увімкнути/вимкнути додавання до кінця"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Увімкнути/вимкнути додавання до початку"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "Увімкнути/вимкнути резервне копіювання початкового файла"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Виконати зовнішню команду"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Передати каналом поточний буфер (або позначену область) команді"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Не перетворювати з формату DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "Увімкнути/вимкнути використання нового буферу"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Закрити буфер без його збереження"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "До переглядача файлів"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Вийти з переглядача файлів"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "Перейти до першого файла у списку"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "Перейти до останнього файла у списку"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "Перейти до попереднього файла у списку"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "Перейти до наступного файла у списку"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "До каталогу"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Викликати linter, якщо доступний"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "До попереднього пов. linter"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Перейти до наступного повідомлення linter"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Довідка"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Виписати"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Чит. файл"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Вирівняти"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Перемалювати"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Пошук"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Заміна"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "До каталогу"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Вирізати"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "Вставити текст"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Правопис"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Позиція"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "До Рядка"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Скасувати"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Повторити"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Помітити"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Скопіювати текст"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "РегЗалеж"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "ФормВир"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Назад"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Не Заміщати"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Старіше"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Новіше"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "Вирівняти"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "До дужки"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Зберегти"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Де було"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Назад"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Далі"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Вперед"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "ПопСлово"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "НастСлово"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Початок"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Кінець"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "ПопРядок"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "НастРядок"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Гортати вгору"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Гортати вниз"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Поп. блок"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Наст. блок"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Поч.абзацу"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Кін.абзацу"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "Поп.Стор."
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Наст.Стор."
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Перший Рядок"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Останній Рядок"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Поп. файл"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Наступний файл"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Delete"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "Вирізати ліворуч"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "Обрізати ліворуч"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "Вирізати праворуч"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "Обрізати праворуч"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "ВирДоКінця"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Кількість слів"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Буквально"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Призупинка -"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Відступ"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Скас.відступ"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Закоментувати рядки"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Завершено"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Записати"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Виконати макрос"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Прибрати текст"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "До linter"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Зберегти"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "До тексту"
@@ -1179,59 +1177,59 @@ msgstr "Наст. пов. lint"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Режим довідки"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Постійно показувати місце розташування курсора"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Плавна прокрутка"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Гортання із перестрибуванням (на півекрана)"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "М’яке перенесення надто довгих рядків"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Показ пробілів"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Підсвічування синтаксису кольором"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Розумна клавіша Home"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Автовідступ"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Вирізати до кінця"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Жорстке перенесення надзвичайно довгих рядків"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Перетворення знаків табуляції на пробіли"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Підтримка миші"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Призупинення"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Нумерація рядків"
 
@@ -1533,8 +1531,8 @@ msgstr ""
 "\n"
 " Редактор nano розроблено для емуляції функціональності та простоти "
 "використання оригінального редактора UW Pico.  Редактор розбито на 4 основні "
-"частини: верхній рядок містить версію програми, назву поточного файла, який  "
-"редагується, та чи було внесено зміни у поточний файл. Друга частина — це "
+"частини: верхній рядок містить версію програми, назву поточного файла, який "
+"редагують, та чи було внесено зміни у поточний файл. Друга частина — це "
 "головне вікно редагування, у якому  показано редагований файл. Рядок стану — "
 "3 рядок знизу — містить різні важливі повідомлення.  "
 
@@ -1607,19 +1605,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Помилка під час спроби записати %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Некоректна клавіша у режимі перегляду"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Цю функцію вимкнено у обмеженому режимі"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Довідка недоступна"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1628,7 +1626,7 @@ msgstr ""
 "\n"
 "Буфер записано до %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1637,7 +1635,7 @@ msgstr ""
 "\n"
 "Буфер не записано до %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1646,7 +1644,7 @@ msgstr ""
 "\n"
 "Буфер не записано: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1657,7 +1655,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1666,7 +1664,7 @@ msgstr ""
 "Щоб розташувати курсор у певному рядку файла, вкажіть номер рядка із «+»\n"
 "перед назвою файла. Позицію у рядку можна вказати після коми.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1676,281 +1674,293 @@ msgstr ""
 "введення.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Параметр\t\tДовга форма\t\tПризначення\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Увімкнути розумну кнопку Home"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Зберігати резервні копії наявних файлів"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <кат>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Каталог для зберігання унікальних резервних копій"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "Використовувати жирний шрифт замість звичайного"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Перетворювати табуляції у пробіли"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Типово читати файл до нового буфера"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Використовувати файли блокування (як у vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Вести журнал та читати історію умов пошуку/заміни"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Не використовувати файли nanorc"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "Показувати напрямну у цій позиції"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Виправляти проблему малої клавіатури"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "Не додавати порожні рядки у кінці файла"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "Не додавати новий рядок автоматично [типово]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Обрізати кінцеві пробіли при жорсткому перенесенні"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Не перетворювати файли з формату DOS/Mac"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "Використовувати додатковий рядок для редагування"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Записувати до журналу і читати позицію курсора"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <ф_вираз>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<ф_вираз>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Формальний вираз для відповідника лапок"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Обмежений режим"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "Гортати на рядок, а не на пів екрана"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#число>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#число>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "Встановити ширину табуляції у #число позицій"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Використовувати швидке очищування рядка стану"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "Показати версію та вийти"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "Використовувати більш точне визначення меж слів"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <ряд>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<ряд>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Які інші символи є частинами слів"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <назва>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<назва>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Опис синтаксису, який слід використовувати для розфарбування"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Дозволити Bsp і Del витирати позначену область"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Розривати рядки на пробілах"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Автоматично жорстко переносити надто довгі рядки"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Постійно показувати позицію курсора"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Виправити проблему Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "Порожній рядок під смужкою заголовка"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "Додавати символ нового рядка наприкінці тексту"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Показувати курсор у переглядачі файлів і довідці"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Показати текст цієї довідки і завершити роботу"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Автоматично вирівнювати нові рядки"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "Гортати на півекрана, а не на рядок"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "Вирізати від курсора до кінця рядка"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Показувати номери рядків перед текстом"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Дозволити використання миші"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "Не читати файл (лише записувати до нього)"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <кат>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<кат>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Встановити робочий каталог"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Зберегти клавіші XON (^Q) та XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#поз>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#поз>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "Встановити значення позиції жорсткого перенесення #поз"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "Встановити позицію для жорсткого перенесення і вирівнювання"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <програма>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<програма>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Альтернативна програма перевірки правопису"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Автоматичне збереження при виході, без запитань"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Типово зберігати файл у форматі Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Режим перегляду (лише читання)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "Не переносити надто довгі рядки жорстко"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "Не переносити надто довгі рядки жорстко [типово]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Не показувати два рядка довідки внизу"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Ctrl+Стрілка праворуч зупиняється на кінцях слів"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Дозволити призупинення"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Увімкнути м’яке перенесення рядків"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano версії %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " © Учасники розробки nano, 2014-%s\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " Ел. пошта: nano@nano-editor.org\tІнтернет: https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1959,280 +1969,299 @@ msgstr ""
 "\n"
 " Зібрано з таким параметрами:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Немає назви файла"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Зберегти зміни у буфері? (Відповідь «Ні» призведе до ВТРАТИ змін.) "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr ""
 "Читаємо дані зі стандартного джерела даних; натисніть ^D або ^D^D, щоб "
 "завершити.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Не вдалося відкрити stdin: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не вдалося повторно відкрити стандартний ввід з клавіатури\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Прийнято SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr ""
 "Вибачте! Nano зазнала аварії! Код: %d. Будь ласка, повідомте розробникам про "
 "цю ваду.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Використовуйте «fg» для повернення у nano\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Призупинення не увімкнено"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "дозволено"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "заборонено"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Непов’язана комбінація"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Непов’язана комбінація: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Непов’язана комбінація: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "Непов’язана комбінація: ^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Непов’язана комбінація: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Непов’язана комбінація: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Напрямна позиція «%s» є некоректною"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "Параметр %s проігноровано; це типова поведінка\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запитаний розмір табуляції «%s» не підходить"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Надіслано запит на некоректний розмір заповнення «%s»"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введіть команду «%s -h», щоб отримати список доступних параметрів.\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Помилковий формальний вираз «%s» у лапках: %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Некоректний номер рядка або позиції"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Помилки у «%s»"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Вітаємо у nano. Базова довідка: Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "YyТт"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnНн"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Так"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Ні"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Все"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Помилка в %s на рядку %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент %s має незакриту \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Рядки формальних виразів повинні починатися та закінчуватися лапками (\")"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Не вірний формальний вираз «%s»: %s"
+msgstr "Помилковий формальний вираз «%s»: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Пропущено назву синтаксису"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Непарний знак лапок у назві синтаксису"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтаксис «none» зарезервовано"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Синтаксис «default» не може мати розширень"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Пропущено назву клавіші"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Назва клавіші є надто короткою"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Назва клавіші має починатися з «^», «M» або «F»"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Назва ключа %s є некоректною"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "Для прив’язування клавіші слід вказати функцію"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Слід вказати меню (або «all»), до якого слід прив’язати клавішу або "
 "відв’язати її"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Не можна пов’язати назву «%s» з функцією"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Неможливо пов’язати назву «%s» з меню"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "У меню «%2$s» немає пункту «%1$s»"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Вибачте, призначення «%s» змінювати не можна"
+msgid "Keystroke %s may not be rebound"
+msgstr "Призначення %s змінювати не можна"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Помилка під час розгортання %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Невідомий колір «%s»"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Колір тла не може бути світлим"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr ""
 "Використання команди «%s» потребує попереднього використання команди «syntax»"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Пропущено назву кольору"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Не вистачає рядка формального виразу після команди «%s»"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Порожній формальний вираз"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" потребує відповідного \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Синтаксис «default» не може використовувати формальні вирази «%s»"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Пропущений аргумент після «%s»"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Аргумент «%s», не вистачає завершальної \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Із функцією «%s» у меню «%s» не пов'язано ніяких комбінацій клавіш. "
 "Завершуємо роботу.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2240,58 +2269,58 @@ msgstr ""
 "Якщо потрібно, скористайтеся nano з параметром -I, щоб скоригувати параметри "
 "у nanorc.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не вдалося знайти синтаксичну конструкцію «%s» для розширення"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис «%s» не має колірних команд"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Команда «%s» не дозволена у включеному файлі"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Невідома команда «%s»"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Пропущено параметр"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Невідомий параметр «%s»"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Неможливо скасувати визначення параметра «%s»"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опція «%s» вимагає аргумент"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Аргумент не є коректним багатобайтовим рядком"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "Вимагається непорожній символ"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Вимагається два одинарних символи"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "Я не можу знайти свою домівку! Жах!"
 
@@ -2354,238 +2383,246 @@ msgstr "Не дужка"
 msgid "No matching bracket"
 msgstr "Нема відповідної дужки"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Мітку встановлено"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Мітку знято"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Помилка виконання «%s»"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Додавання коментарів у файлах цього типу не передбачено"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Не можна закоментувати дані за кінцем файла"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Буфер скасування дій порожній!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "додавання тексту"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "додавання"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "розрив рядка"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "вилучення тексту"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "вилучення"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "об’єднання рядків"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "заміна тексту"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "заміну"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "витирання"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "обрізка тексту"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "вирізання"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "скасування обрізки тексту"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "вставлення"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "вставка тексту"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "вставлення"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "відступ"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "скас.відступ"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "закоментувати"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "розкоментувати"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "Скасована дія (%s)"
+msgid "Undid %s"
+msgstr "Скасувати %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Немає чого повторювати!"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "Повторена дія (%s)"
+msgid "Redid %s"
+msgstr "Повторити %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Не можу створити канал (pipe)"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Не можу зробити fork()"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "фільтрування"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Не вдалося відкрити канал: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Поганий рядок цитування %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "вирівнювання"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "Вирівняне позначення"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "Вирівняний файл"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Можу зараз же СкасВирівнювання!"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "Вирівняний абзац"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Непридатне до пошуку слово: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Редагувати заміну"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Наступне слово…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "Не можу отримати розмір буферу каналу"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Помилка виконання \"spell\""
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Помилка виконання \"sort -f\""
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Помилка виконання \"uniq\""
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Перевірка орфографії не вдалася: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Не вдалось перевірити орфографію: %s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Для цього типу файлів не визначено обробника!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Зберегти змінений буфер перед обробкою?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Викликаємо linter, зачекайте"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Від команди отримано 0 придатних рядків: %s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Це повідомлення пов’язано із невідкритим файлом %s. Відкрити його у новому "
 "буфері?"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Для цього файла повідомлень немає"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "На першому повідомленні"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "На останньому повідомленні"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sСлів: %zu Рядків: %zd  Символів: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "У позначеному:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Буквальний ввід"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Немає фрагмента слова"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Далі немає відповідників"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Немає відповідників"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano не вистачає вільної пам'яті!\n"
 
@@ -2611,79 +2648,125 @@ msgstr "Забагато помилок від stdin\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Невідома послідовність"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Введення Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Обробка --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "Кат.:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Змінено"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Вигляд"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "Обмежений"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Подальші попередження не показано"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "рядок %zd/%zd (%d%%), позиція %zu/%zu (%d%%), символ %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Текстовий редактор nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "версія"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Створено для Вас:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Особлива подяка:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation (Фонд Вільного Програмного забезпечення)"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "багатьом перекладачам та TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "та іншим, кого ми забули..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Дякуємо за використання nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "СкасВиріз"
+
+#~ msgid "Unjustify"
+#~ msgstr "СкасВирівн"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Скасувати вирізання та вставити зміст \"кишені\" до поточного рядка"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Плавна прокрутка"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "Не додавати порожні рядки у кінці файла"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Використовувати додатковий рядок для редагування"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "Встановити значення позиції жорсткого перенесення #поз"
+
+#~ msgid "text add"
+#~ msgstr "додавання тексту"
+
+#~ msgid "text delete"
+#~ msgstr "вилучення тексту"
+
+#~ msgid "text replace"
+#~ msgstr "заміна тексту"
+
+#~ msgid "text cut"
+#~ msgstr "обрізка тексту"
+
+#~ msgid "text uncut"
+#~ msgstr "скасування обрізки тексту"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Поганий рядок цитування %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Можу зараз же СкасВирівнювання!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Клавіша недійсна у не мультибуферному режимі"
 
diff --git a/po/vi.po b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 3.2-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
 "PO-Revision-Date: 2018-11-06 08:59+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -33,9 +33,9 @@ msgstr "Không thể mở thư mục: %s"
 msgid "Go To Directory"
 msgstr "Đi tới thư mục"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
@@ -50,9 +50,9 @@ msgstr "Không thể đi ra bên ngoài của %s"
 msgid "Can't move up a directory"
 msgstr "Không thể nhảy lên một thư mục"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Gặp lỗi khi đọc %s: %s"
@@ -98,17 +98,17 @@ msgstr "Đây là lần xảy ra duy nhất"
 msgid "No current search pattern"
 msgstr "Không có mẫu tìm kiếm hiện tại"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "Không hiểu tên cú pháp: %s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() gặp lỗi: %s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) gặp lỗi: %s"
@@ -202,7 +202,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu dòng (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "Bộ nhớ đệm mới"
 
@@ -301,789 +301,793 @@ msgstr "Tập tin để chèn không được chuyển đổi [từ %s]"
 msgid "File to insert [from %s]"
 msgstr "Tập tin để chèn [từ %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
+#: src/files.c:1467
+#, fuzzy, c-format
+msgid "Invalid operating directory: %s\n"
 msgstr "Thư mục thao tác không hợp lệ\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr ""
 "Gặp lỗi khi ghi tập tin sao lưu dự phòng, tiếp tục ghi? (Gõ N hay K nếu "
 "không chắc chắn.)"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
+#: src/files.c:1534
+#, fuzzy, c-format
+msgid "Invalid backup directory: %s\n"
 msgstr "Thư mục sao lưu dự phòng không hợp lệ\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, 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:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, 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:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "Quá nhiều tập tin sao lưu dự phòng?"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Gặp lỗi khi ghi tập tin tạm thời: %s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "Đã ghi %zu dòng"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [Định dạng DOS]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Định dạng Mac]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [Sao lưu dự phòng]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "Thêm lựa chọn vào trước Tập tin"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "Thêm lựa chọn vào sau Tập tin"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "Lưu lựa chọn vào một tập tin"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "Tên tập tin để thêm vào trước"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "Tên tập tin để thêm vào sau"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "Tên tập tin dùng để ghi vào"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "Quá bé"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "Tập tin đã sẵn có -- không thể ghi đè"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "Ghi tập tin bằng TÊN MỚI? "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "Tập tin \"%s\" đã có sẵn, GHI ĐÈ LÊN? "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "Tập tin trên đĩa đã bị thay đổi"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "Tập tin bị sửa đổi kể từ lần bạn mở cuối cùng, có tiếp tục lưu không? "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "Đóng"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "Dán chữ"
-
-#: src/global.c:529
-msgid "Unjustify"
-msgstr "BỏCănHàng"
-
 #. 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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "Hủy hàm hiện tại"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "Đóng bộ đệm tập tin hiện tại / Thoát khỏi nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "Ghi bộ đệm tập tin hiện tại (hoặc vùng đã đánh dấu) lên đĩa"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr ""
 "Chèn tập tin khác vào bộ nhớ đệm tập tin hiện tại (hoặc vào một bộ đệm mới)"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "Tìm tiếp một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "Tìm chiều ngược một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "Tìm tiếp cho một chuỗi"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "Tìm ngược lại cho  một chuỗi"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "Lấy danh sách tập tin"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "Chuyển tới cột tay trái"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "Chuyển tới cột tay phải"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "Chuyển tới dòng đầu tiên trong cột này"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "Chuyển tới dòng cuối cùng trong cột này"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "Đi lên một màn hình"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "Đi xuống một màn hình"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "Cắt dòng hiện tại (hoặc vùng đã đánh dấu) và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Dán từ bộ đệm cắt vào dòng hiện tại"
+#: src/global.c:560
+#, fuzzy
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "Chèn một ký tự tab tại vị trí con trỏ"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "Hiển thị vị trí con trỏ"
 
-#: src/global.c:569
+#: src/global.c:563
 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:571
+#: src/global.c:565
 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:572
+#: src/global.c:566
 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:574
+#: src/global.c:568
 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:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr ""
 "Sao chép dòng hiện tại (hoặc vùng đã đánh dấu) và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "Vứt dòng hiện tại (hoặc dòng đánh dấu) đi"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "Thụt lề dòng hiện tại (hoặc dòng đánh dấu)"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "Bỏ thụt lề dòng hiện tại (hoặc dòng đánh dấu)"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "Hủy bước vừa mới làm"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "Làm lại bước vừa mới được hủy"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "Lùi lại một ký tự"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "Tiếp tới một ký tự"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "Lùi lại một từ"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "Tiếp tới một từ"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "Về dòng trước"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "Tới dòng kế"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "Về đầu của dòng hiện tại"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "Tới cuối của dòng hiện tại"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "Về khối văn bản kế trước"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "Về khối văn bản kế tiếp"
 
-#: src/global.c:595
+#: src/global.c:589
 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:597
+#: src/global.c:591
 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:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "Về dòng đầu của tập tin"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "Tới dòng cuối của tập tin"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "Tới dấu ngoặc tương ứng"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "Cuộn lên một dòng nhưng giữ nguyên vị trí con trỏ"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "Cuộn xuống một dòng nhưng giữ nguyên vị trí con trỏ"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "Chuyển tới bộ đệm tập tin trước"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "Chuyển tới bộ đệm tập tin tiếp theo"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "Chèn một ký tự tab tại vị trí con trỏ"
 
-#: src/global.c:616
+#: src/global.c:610
 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:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "Xóa ký tự nằm dưới con trỏ"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "Xóa ký tự ở bên trái con trỏ"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
+#: src/global.c:616
+#, fuzzy
+msgid "Delete backward from cursor to word start"
 msgstr "Cắt từ vị trí con trỏ ngược tới đầu từ"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
+#: src/global.c:618
+#, fuzzy
+msgid "Delete forward from cursor to next word start"
 msgstr "Cắt từ vị trí con trỏ tới từ kế tiếp"
 
-#: src/global.c:626
+#: src/global.c:620
 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:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "Đếm số từ, số dòng và số ký tự"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "Cập nhật (vẽ lại) màn hình hiện tại"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "Ngưng trình soạn thảo (nếu tính năng ngưng đã được bật)"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "Thử và điền nốt từ hiện tại"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "Đổi dòng hiện tại hay đã đánh dấu thành chú thích/hoặc thôi"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "Lưu tập tin mà không cần hỏi"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "Tìm chỗ khớp kế trước"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "Tìm chỗ khớp phía trước"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "Bắt đầu hoặc dừng ghi một vĩ lệnh"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "Chạy vĩ lệnh được ghi cuối cùng"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "Bật/tắt phân biệt chữ HOA/thường khi tìm kiếm"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "Đảo ngược hướng tìm"
 
-#: src/global.c:659
+#: src/global.c:653
 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:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế trước"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế kế"
 
-#: src/global.c:667
+#: src/global.c:661
 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:668
+#: src/global.c:662
 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:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "Bật/tắt khả năng phụ thêm"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "Bật/tắt khả năng thêm vào trước"
 
-#: src/global.c:671
+#: src/global.c:665
 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:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "Thực hiện câu lệnh ngoại trú"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "Chuyển bằng đường ống bộ đệm hiện tại (hoặc vùng đã đánh dấu) đến lệnh"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "Đừng chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:678
+#: src/global.c:672
 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:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "Đóng bộ đệm dữ liệu mà không ghi lại nó"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "Đi tới trình duyệt tập tin"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "Thoát khỏi trình duyệt tập tin"
 
-#: src/global.c:684
+#: src/global.c:678
 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:685
+#: src/global.c:679
 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:686
+#: src/global.c:680
 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:687
+#: src/global.c:681
 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:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "Đi tới thư mục"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "Gọi phần mềm kiểm chuẩn, nếu có"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "Đến lời nhắn kiểm chuẩn kế trước"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "Đến lời nhắn kiểm chuẩn kế"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "Trợ giúp"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "Ghi lại"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "Đọc T.tin"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "Sắp hàng"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "Tìm kiếm"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "Thay thế"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "Tới ThMục"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "Cắt chữ"
 
-#: src/global.c:781
+#: src/global.c:764
+#, fuzzy
+msgid "Paste Text"
+msgstr "VBản ra ống"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "Chính tả"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "Vị trí"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "Tới dòng"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "Đdấu VBản"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "Chép VBản"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "HOA/thường"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "BTCQ"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "Ngược lại"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "Không thay"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "Cũ hơn"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "Mới hơn"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "SắpHàngĐủ"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "Đặt Ngoặc"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "Lưu"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "Tìm ngược"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "Kế trước"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "Kế tiếp"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "Lùi"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "Kế tiếp"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "Từ kế"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "Dòng trước"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "Dòng kế"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "Cuộn lên"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "Cuộn xuống"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "Khối trước"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "Khối sau"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "Đầu đoạn"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "Cuối đoạn"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "TrangTrước"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "Trang kế"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "Dòng đầu"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "Dòng cuối"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "Tệp Trước"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "Tệp Sau"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "Xóa lùi"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "Xóa"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+#, fuzzy
+msgid "Chop Left"
 msgstr "Cắt Trái"
 
-#: src/global.c:947
-msgid "Cut Right"
+#: src/global.c:950
+#, fuzzy
+msgid "Chop Right"
 msgstr "Cắt Phải"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "CắtĐếnCuối"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "Đếm từ"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "Đúng nguyên văn"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "Ngưng"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "Thụt lề"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "Bỏ thụt lề"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "Thành ghi chú"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "Điền nốt"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "Ghi lại"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "Chạy vĩ lệnh"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "Zap VBản"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "KiểmChuẩn"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "Lưu"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "Tới văn bản"
@@ -1163,59 +1167,60 @@ msgstr "LNhắn Lint sau"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con trỏ"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "Cuộn trơn mượt"
+#: src/global.c:1412
+#, fuzzy
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "Cuộn theo dòng thay vào theo nửa màn hình"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "Ngắt mềm những dòng dài"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "Tô sáng cú pháp"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "Tự thụt lề"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "Ngắt cứng những dòng dài"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "Đánh số dòng"
 
@@ -1583,19 +1588,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "Gặp lỗi khi ghi %s: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "Phím không hợp lệ trong chế độ xem"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "Chức năng này bị tắt trong chế độ hạn chế"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "Phần trợ giúp không sẵn có"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1604,7 +1609,7 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm ghi vào %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1613,7 +1618,7 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm chưa được ghi vào %s: %s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1622,7 +1627,7 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm chưa được ghi lại: %s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1633,7 +1638,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1642,7 +1647,7 @@ msgstr ""
 "Đặt con trỏ trên một dòng rõ ràng của tập tin, đặt con số dòng với\n"
 "một “+” trước tên tập tin. Số dòng có thể thêm sau một dấu phẩy.\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1651,283 +1656,298 @@ msgstr ""
 "Khi tên tập tin là “-”, sẽ đọc dữ liệu từ đầu vào tiêu chuẩn.\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Tùy chọn\tTùy chọn GNU dài\tÝ nghĩa\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "Bật dùng phím home khéo"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "Lưu trữ các tập tin đã có"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <thư_mục>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<thư_mục>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "Thư mục để lưu tập tin lưu trữ duy nhất"
 
-#: src/nano.c:785
+#: src/nano.c:781
 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:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "Chuyển tab thành dấu cách"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "Đọc một tập tin vào một bộ đệm mới theo mặc định"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "Dùng các tập tin khóa (kiểu-vim)"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "Ghi lại & đọc lịch sử chuỗi tìm kiếm/thay thế"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "Đừng xem các tập tin nanorc"
 
+#: src/nano.c:803
+#, fuzzy
+msgid "Show a guiding bar at this column"
+msgstr "Chuyển tới dòng đầu tiên trong cột này"
+
 #: src/nano.c:806
 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:808
-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:809
+msgid "Don't add an automatic newline [default]"
+msgstr ""
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "Cắt bỏ khoảng trắng khi ngắt dòng cứng"
 
-#: src/nano.c:815
+#: src/nano.c:817
 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:817
-msgid "Use one more line for editing"
-msgstr "Sử dụng một dòng thêm để soạn thảo"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "Ghi nhật ký & đọc vị trí tại vị trí con trỏ"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <btcq>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<btcq>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "Biểu thức chính quy để khớp trính dẫn"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "Chế độ hạn chế"
 
 #: src/nano.c:830
-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:832
 msgid "-T <#cols>"
 msgstr "-T <#số_cột>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#số_cột>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 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:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "Xóa nhanh dòng trạng thái"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "In ra thông tin phiên bản và thoát"
 
-#: src/nano.c:838
+#: src/nano.c:836
 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:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <chuỗi>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<chuỗi>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "Khối khác nào là các bộ phận của từ"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <tên>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<tên>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "Định nghĩa cú pháp để sử dụng khi tô màu"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "Để Bsp và Del tẩy vùng đã đánh dấu"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "Khi ngắt dòng mềm, thực hiện nó tại vị trí khoảng trắng"
 
-#: src/nano.c:851
+#: src/nano.c:850
+#, fuzzy
+msgid "Automatically hard-wrap overlong lines"
+msgstr "Đừng ngắt những dòng dài"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "Luôn luôn hiển thị vị trí con trỏ"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Giải quyết vấn đề nhầm lẫn Backspace/Delete"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr ""
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr ""
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "Hiện con trỏ trong bộ duyệt tập tin & văn bản trợ giúp"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "Hiển thị trợ giúp này rồi thoát"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "Tự động thụt các dòng mới"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr ""
+
+#: src/nano.c:867
 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:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "Hiển thị số của dòng phía trước của vă bản"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "Hỗ trợ việc dùng chuột"
 
-#: src/nano.c:869
+#: src/nano.c:875
 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:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <thư_mục>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<tmục>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "Đặt thư mục thao tác"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Cấm các phím XON (^Q) và XOFF (^S)"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#số_cột>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#số_cột>"
 
-#: src/nano.c:877
-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:883
+msgid "Set width for hard-wrap and justify"
+msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <chương trình>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<ch_trình>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "Dùng chương trình kiểm tra chính tả khác"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "Tự động lưu khi thoát, đừng hỏi lại"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "Lưu một tập tin theo mặc định ở dạng định Unix"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "Chế độ xem (chỉ đọc)"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
+#: src/nano.c:896
+#, fuzzy
+msgid "Don't hard-wrap long lines [default]"
 msgstr "Đừng ngắt những dòng dài"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "Đừng hiển thị hai dòng trợ giúp"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "Làm cho Ctrl+Right dừng tại cuối từ"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "Bật tạm ngưng"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "Bật ngắt dòng mềm"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano, phiên bản %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s những người đóng góp cho nano\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr ""
 " Địa chỉ thư: nano@nano-editor.org\tWeb: https://www.nano-editor.org/\n"
 " Thông báo lỗi dịch cho: http://translationproject.org/team/vi.html"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1936,272 +1956,292 @@ msgstr ""
 "\n"
 " Tùy chọn biên dịch:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "Không có tên tập tin"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "Lưu bộ đệm đã sửa? (Câu trả lời \"No\" sẽ LOẠI BỎ các thay đổi.)"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "Đọc từ đầu vào tiêu chuẩn; gõ ^D hay ^D^D để hoàn tất.\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "Gặp lỗi khi khi mở đầu vào tiêu chuẩn: %s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 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:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "Rất tiếc! Nano đã đổ vỡ! Mã: %d. Vui lòng báo cáo lỗi này.\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Dùng “fg” để quay lại nano.\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "Chế độ tạm dừng không được bật"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "được bật"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "Thôi ràng buộc phím"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "Thôi ràng buộc phím: M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "Thôi ràng buộc phím: M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+#, fuzzy
+msgid "Unbindable key: ^["
+msgstr "Thôi ràng buộc phím: M-["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "Thôi ràng buộc phím: ^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "Thôi ràng buộc phím: %c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, fuzzy, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "Tên phím “%s” không hợp lệ"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr ""
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tab “%s” không hợp lệ"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tô đầy “%s” không hợp lệ"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, 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"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, fuzzy, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "Biểu thức chính quy sai “%s”: %s"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "Sai trong “%s”"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "Chào đón bạn dùng nano. Để xem trợ giúp cơ bản, hãy gõ Ctrl+G."
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "YyCc"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "NnKk"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "AaTt"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "Có"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "Không"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "Tất cả"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "Có lỗi trong %s trên dòng %zu: "
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Đối số “%s” chưa được \" kết thúc"
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Biểu thức chính quy phải bắt đầu và kết thúc bởi một ký tự \""
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Biểu thức chính quy sai “%s”: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "Thiếu tên cú pháp"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "Dấu trích dẫn không đủ cặp trong tên cú pháp"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "Cú pháp “none” là được để dành dùng trong tương lai"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "Cú pháp “default” không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "Thiếu tên phím"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "Tên phím quá ngắn"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Tên phím phải bắt đầu với “^”, “M” hoặc “F”"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "Tên phím “%s” không hợp lệ"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 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:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 "Phải chỉ định một trình đơn (hoặc \"all\") để mà ràng buộc hay không vào phím"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, 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:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Không thể ánh xạ tên “%s” đến một trình đơn"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Chức năng “%s” không tồn tại trong trình đơn “%s”"
 
-#: src/rcfile.c:466
-#, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
+#: src/rcfile.c:477
+#, fuzzy, c-format
+msgid "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:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Gặp lỗi khi khải triển %s: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "Không hiểu màu “%s”"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "Màu nền không thể là màu sáng"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "Một lệnh “%s” cần có lệnh “syntax” đi trước"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "Thiếu chuỗi biểu thức chính quy sau lệnh “%s”"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "Chuỗi biểu thức chính quy trống rỗng"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "“start=” (bắt đầu) thì yêu cầu một phần “end=” (kết thúc) tương ứng"
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "Cú pháp “default” không chấp nhận biểu thức chính quy “%s”"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "Thiếu tham số sau “%s”"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "Đối số của “%s” thiếu \" kết thúc"
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr ""
 "Chưa có phím nào tổ hợp cùng hàm “%s” trong trình đơn “%s”. Nên thoát ra.\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -2209,58 +2249,58 @@ msgstr ""
 "Nếu cần, hãy sử dụng trình soạn thảo nano với tùy chọn “-I” để điều chỉnh "
 "cài đặt nanorc của bạn.\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, 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:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Cú pháp “%s” không có câu lệnh màu"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Lệnh “%s” không được phép trong tập tin đã bao gồm"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Không hiểu câu lệnh “%s”"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "Thiếu tùy chọn"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Không hiểu tùy chọn “%s”"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Không thể bỏ đặt tùy chọn “%s”"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tùy chọn “%s” cần một tham số"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "Tham số không phải là một chuỗi đa byte hợp lệ"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 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:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 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!"
 
@@ -2321,237 +2361,250 @@ msgstr "Không phải ngoặc đơn"
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "Đánh dấu văn bản"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "Hủy dấu văn bản"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Lỗi gọi “%s”"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "Đổi sang thành ghi chú không được hỗ trợ với kiểu tập tin này"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "Không thể chuyển sang ghi chú qua cuối tập tin"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "Không có gì trong vùng đệm hủy bước!"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "thêm văn bản"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr ""
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
 msgstr "ngắt dòng"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "xóa văn bản"
+#: src/text.c:567 src/text.c:748
+#, fuzzy
+msgid "deletion"
+msgstr "Trong lựa chọn:  "
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "nối dòng"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "thay thế văn bản"
+#: src/text.c:596 src/text.c:776
+#, fuzzy
+msgid "replacement"
+msgstr "Sửa chuỗi thay thế"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "dọn dẹp"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "văn bản cắt"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr ""
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "văn bản dán"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr ""
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
+#: src/text.c:628 src/text.c:808
+#, fuzzy
+msgid "insertion"
 msgstr "chèn văn bản"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "thụt lề"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "thôi thụt lề"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "ghi chú"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "bỏ ghi chú"
 
-#: src/text.c:868
-#, c-format
-msgid "Undid action (%s)"
+#: src/text.c:677
+#, fuzzy, c-format
+msgid "Undid %s"
 msgstr "Bước được hủy (%s)"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "Không có gì cần hoàn lại!"
 
-#: src/text.c:1039
-#, c-format
-msgid "Redid action (%s)"
+#: src/text.c:848
+#, fuzzy, c-format
+msgid "Redid %s"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "Không thể tạo đường ống"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "lọc"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "Gặp lỗi khi mở đường ống: %s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Chuỗi trích dẫn sai %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr ""
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr ""
+
+#: src/text.c:2274
+#, fuzzy
+msgid "Justified file"
+msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "Bây giờ có thể Bỏ sắp chữ!"
+#: src/text.c:2276
+#, fuzzy
+msgid "Justified paragraph"
+msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "Không thể tìm từ: %s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "Sửa chuỗi thay thế"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "Từ kế…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ…"
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 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:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "Gặp lỗi khi gọi “spell”"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "Gặp lỗi khi gọi “sort -f”"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "Gặp lỗi khi gọi “uniq”"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, 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:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "Không có kiểm chuẩn cho kiểu này của tập tin!"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "Ghi lại bộ đệm đã sửa trước khi kiểm chuẩn?"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "Đang gọi bộ kiểm chuẩn, vui lòng chờ"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, 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:3234
+#: src/text.c:2998
 #, 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:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "Không có lời nhắn cho tập tin này"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "Tại thông báo đầu"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "Tại thông báo cuối"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%sTừ: %zu  Dòng: %zd  Ký tự: %zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "Trong lựa chọn:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "Dữ liệu nhập nguyên bản"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "Không mảnh chữ nào"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "Không tìm thấy thêm kết quả nào khớp"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "Không tìm thấy"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "Nano làm hết bộ nhớ!\n"
 
@@ -2577,79 +2630,126 @@ msgstr "Quá nhiều lỗi từ đầu vào tiêu chuẩn\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "Chuỗi chưa biết"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Đầu vào Unicode: %s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Đang kiểm chuẩn --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "TMỤC:"
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "Đã sửa đổi"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "Trình bày"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+#, fuzzy
+msgid "Restricted"
+msgstr "Chế độ hạn chế"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "Chặn nhiều cảnh báo hơn nữa"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "dòng %zd/%zd (%d%%), cột %zu/%zu (%d%%), ký tự %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "Được đem tới bởi:"
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "Đặc biệt cảm ơn:"
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần mềm Tự do (FSF)"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "nhiều người dịch thuật và TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "Dành cho ncurses:"
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "và những người khác mà chúng tôi quên…"
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ msgid "Uncut Text"
+#~ msgstr "Dán chữ"
+
+#~ msgid "Unjustify"
+#~ msgstr "BỏCănHàng"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "Dán từ bộ đệm cắt vào dòng hiện tại"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "Cuộn trơn mượt"
+
+#~ 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"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "Sử dụng một dòng thêm để soạn thảo"
+
+#~ 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"
+
+#~ msgid "text add"
+#~ msgstr "thêm văn bản"
+
+#~ msgid "text delete"
+#~ msgstr "xóa văn bản"
+
+#~ msgid "text replace"
+#~ msgstr "thay thế văn bản"
+
+#~ msgid "text cut"
+#~ msgstr "văn bản cắt"
+
+#~ msgid "text uncut"
+#~ msgstr "văn bản dán"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "Chuỗi trích dẫn sai %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "Bây giờ có thể Bỏ sắp chữ!"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "Phím không hợp lệ trong chế độ khác đa bộ đệm"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -4,13 +4,13 @@
 #
 # LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010, 2011, 2015.
-# Boyuan Yang <073plan@gmail.com>, 2018.
+# Boyuan Yang <073plan@gmail.com>, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 3.2-pre1\n"
+"Project-Id-Version: nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-07 15:12-0500\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-13 13:00-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 2.2.1\n"
 
 #: src/browser.c:67
 #, c-format
@@ -31,9 +31,9 @@ msgstr "无法打开目录：%s"
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -48,9 +48,9 @@ msgstr "无法访问 %s 外部"
 msgid "Can't move up a directory"
 msgstr "无法上移一个目录"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读取 %s 出错：%s"
@@ -96,17 +96,17 @@ msgstr "这是唯一出现之处"
 msgid "No current search pattern"
 msgstr "没有当前搜索模式"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
 msgstr "未知语法名称：%s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() 失败：%s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) 失败：%s"
@@ -198,7 +198,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- %zu 行（%s）"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "新缓冲区"
 
@@ -297,784 +297,782 @@ msgstr "要不经转换插入的文件 [来自 %s]"
 msgid "File to insert [from %s]"
 msgstr "要插入的文件 [来自 %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "无效的操作目录\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "无效的操作目录：%s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
 msgstr "写入备份文件失败；继续保存吗？（如果不确定请输入N。）"
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "无效的备份目录\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "无效的备份目录：%s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "无法写入%s 外部"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "写入备份文件 %s 出错：%s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
 msgstr "太多备份文件？"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "已写入 %zu 行"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [备份]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
 msgstr "前引选择部份于文件"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
 msgstr "附加选择部份至文件"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
 msgstr "写入选择部份至文件"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
 msgstr "要前引于的文件名"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
 msgstr "要附加至的文件名"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "要写入的文件名"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "屏幕过小"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "文件已存在——无法覆写"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
 msgstr "以不同的名称保存文件？ "
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
 msgstr "文件“%s”已存在；要覆盖吗？ "
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "磁盘上的文件已改变"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
 msgstr "在您打开文件后文件已被改变；是否继续保存？"
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(更多)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
 msgstr "离开"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "关闭"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "还原剪切"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "取消当前功能"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
 msgstr "关闭当前缓冲区 / 离开 nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
 msgstr "将当前缓冲区（或标记的区域）写入磁盘"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
 msgstr "将另一个文件插入当前缓冲区（或者插入新缓冲区）"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "正向查找字符串或正则表达式"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
 msgstr "反向查找字符串或正则表达式"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "向前查找字符串"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "向后查找字符串"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "刷新文件列表"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
 msgstr "跳至左栏"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
 msgstr "跳至右栏"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
 msgstr "跳至本栏第一列"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
 msgstr "跳至本栏最后一列"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
 msgstr "向上跳转一屏"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "向下跳转一屏"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
 msgstr "剪切当前行（或者标记的区域）并存至剪贴缓冲区"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "从剪贴板粘贴至当前行"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "在当前游标位置粘贴剪贴缓冲区内容"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "显示光标位置"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "尝试运行拼写检查"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
 msgstr "替换字符串或正则表达式"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
 msgstr "跳至指定行与列位置"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
 msgstr "标记游标所在位置开始的文本"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
 msgstr "复制当前行（或者标记的区域）并存至剪贴缓冲区"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
 msgstr "去除当前行（或者标记的行）"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
 msgstr "缩进当前行（或者标记的行）"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
 msgstr "取消缩进当前行（或者标记的行）"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
 msgstr "撤销上次操作"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
 msgstr "重做撤销的操作"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
 msgstr "向后跳一字符"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
 msgstr "向前跳一字符"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
 msgstr "向后跳一个词"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
 msgstr "向前跳一个词"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
 msgstr "跳至前一行"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
 msgstr "跳至后一行"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
 msgstr "跳至当前行首"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
 msgstr "跳至当前行尾"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
 msgstr "跳至前一段文本"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
 msgstr "跳至后一段文本"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至当前段落开头，如已在段落开头，则调至上一段落起始处"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至当前段落结尾，如已在段落结尾，则调至下一段落结尾"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
 msgstr "跳至文件第一行"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
 msgstr "跳至文件最后一行"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
 msgstr "移动至对应括号"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "向上滚动一行但不移动文本中的游标"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "向下滚动一行但不移动文本中的游标"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "切换至上个文件缓冲区"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "切换至下个文件缓冲区"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "插入下一按键原型"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
 msgstr "插入制表符于游标位置"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
 msgstr "插入新行于游标位置"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "删除游标之下的字符"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "删除游标左侧的字符"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "从游标剪切至单词开始位置"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "从游标向单词起始位置向后删除"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "从游标剪切至下一个单词开始位置"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "从游标向下一个单词起始位置向前删除"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
 msgstr "从游标位置剪切至文件结尾"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "对齐当前段落"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "对齐整个文件"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
 msgstr "计算字数、行数与字符数"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
 msgstr "重新显示当前画面"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
 msgstr "挂起编辑器（如果启用了挂起功能）"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
 msgstr "尝试补全当前单词"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
 msgstr "注释/反注释当前行（或者标记的行）"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "不提示而保存文件"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
 msgstr "向后搜索下一个出现位置"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "向前搜索下一个出现位置"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "开始/停止录制宏"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "运行最近录制的宏"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
 msgstr "切换查找的区分大小写选项"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
 msgstr "反转搜索方向"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
 msgstr "切换使用正则表达式"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
 msgstr "编辑前次搜索/替换字符串"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
 msgstr "编辑下次搜索/替换字符串"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
 msgstr "切换使用DOS 格式"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
 msgstr "切换使用Mac 格式"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
 msgstr "切换追加"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
 msgstr "切换前置插入"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
 msgstr "切换储存既有文件的备份"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
 msgstr "执行外部命令"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
 msgstr "将当前缓冲区（或标记的区域）通过管道送给外部命令"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
 msgstr "不要从 DOS/Mac 格式转换"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
 msgstr "切换使用新缓冲区"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "不保存而关闭缓冲区"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
 msgstr "打开文件选单"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
 msgstr "从文件选单离开"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
 msgstr "跳至文件第一列"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
 msgstr "跳至文件最后一列"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的前一个文件"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
 msgstr "跳至列表中的下一个文件"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
 msgstr "跳至目录"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "尝试运行代码语法检查"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
 msgstr "跳至上一个 linter 信息"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
 msgstr "跳至下一个 linter 信息"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
 msgstr "求助"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
 msgstr "写入"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
 msgstr "读档"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "对齐"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "搜索"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
 msgstr "替换"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
 msgstr "跳至目录"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "剪切文字"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "粘贴文字"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "拼写检查"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "游标位置"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
 msgstr "跳行"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "复制文字"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
 msgstr "区分大小写"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "正则表达式"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
 msgstr "向后搜索"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
 msgstr "不替换"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "更旧"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "更新"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "全部对齐"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "至括号"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "保存"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "向前搜索"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "上一个"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
 msgstr "向后"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "前一个字"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "后一个字"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "上行"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "下行"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "向上卷动"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "向下卷动"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "上一段"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "下一段"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "段落开头"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "段落结尾"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "上页"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "下页"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "首行"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "尾行"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "上个文件"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "下个文件"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
 msgstr "制表符"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
 msgstr "回车"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
 msgstr "退格"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "删除"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "向左剪切"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "向左切除"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "向右剪切"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "向右切除"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "剪切至文末"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
 msgstr "字数统计"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "原本形式"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "缩进"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
 msgstr "取消缩进"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
 msgstr "注释行"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "补全"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "录制"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "运行宏"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
 msgstr "清除文字"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
 msgstr "转至代码语法检查器"
 
+#: src/global.c:1006
+msgid "Save"
+msgstr "保存"
+
 #: src/global.c:1009
 msgid "Go To Text"
 msgstr "跳至文字"
@@ -1154,59 +1152,59 @@ msgstr "下一条 Lint 信息"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
 msgstr "辅助模式"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "持续显示游标位置"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "平滑式卷动画面"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "跳转翻页（按半屏幕）"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
 msgstr "为过长行进行软折行"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "语法色彩高亮"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "智能HOME键"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
 msgstr "剪切至行尾"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
 msgstr "为过长行强制换行"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入制表符至空白的转换"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "鼠标支持"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
 msgstr "挂起"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
 msgstr "行编号"
 
@@ -1553,19 +1551,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "写入 %s 出错：%s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "观看模式中此按键无效"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
 msgstr "在限制模式中此功能被禁用"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
 msgstr "帮助不可用"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1574,7 +1572,7 @@ msgstr ""
 "\n"
 "缓冲内容已写入 %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
@@ -1583,7 +1581,7 @@ msgstr ""
 "\n"
 "缓冲内容未写入至 %s：%s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
@@ -1592,7 +1590,7 @@ msgstr ""
 "\n"
 "缓冲区未写入：%s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
@@ -1603,7 +1601,7 @@ msgstr ""
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
@@ -1612,7 +1610,7 @@ msgstr ""
 "如需启动时将游标置放在文件的特定行上，请在文件名前使用“+”符号加上行号以\n"
 "进行指定。如需同时指定特定列，可以在其后添加半角逗号和列号。\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
@@ -1621,281 +1619,293 @@ msgstr ""
 "当文件名为“-”时，nano 从标准输入读取数据。\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "选项\t\tGNU 长选项\t\t意义\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
 msgstr "启用智能 HOME 键"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "储存既有文件的备份"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <目录>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<目录>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
 msgstr "用以储存独一备份文件的目录"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
 msgstr "用粗体替代颜色反转"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
 msgstr "将已输入的制表符转换为空白"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
 msgstr "默认从文件读入到一个新的缓冲区"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
 msgstr "使用（vim 风格）锁文件"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
 msgstr "记录与读取搜索/替换的历史字符串"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
 msgstr "不要参考nanorc 文件"
 
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "在此栏显示一个导引条"
+
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正数字键区按键混淆问题"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "不要将换行加到文件末端"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "不要自动添加换行符 [默认]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
 msgstr "强制折行时移除末尾空白"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "不要从 DOS/Mac 格式转换"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "编辑时多使用一行"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "记录并读取光标位置"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
 msgstr "-Q <正则表达式>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
 msgstr "--quotestr=<正则表达式>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
 msgstr "匹配引用的正则表达式"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
 msgstr "限制模式"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "按行滚动而不是半屏"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
 msgstr "-T <#列数>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#列数>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
 msgstr "设定制表符宽度为 #列数"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
 msgstr "状态行快速闪动"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "显示版本信息并离开"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
 msgstr "更正确地侦测单字边界"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <字符串>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<字符串>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
 msgstr "指定哪些其它特殊字符也是单词的一部分"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <名称>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<名称>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
 msgstr "用于加亮的语法定义"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
 msgstr "让退格键和删除键清除选中的区域"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
 msgstr "软折行时在空白处进行"
 
-#: src/nano.c:851
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "对过长的行自动强制换行"
+
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "持续显示游标位置"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正退格键/删除键混淆问题"
 
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "保持标题栏下面的行一直为空"
+
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "确保文本以换行符结尾"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
 msgstr "在文件浏览器和帮助文本中显示游标"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "显示本帮助文本并退出"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
 msgstr "自动缩进新行"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "按半屏幕滚动文本，不按行"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "从游标剪切至行尾"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
 msgstr "在文本之前显示行号"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "启用鼠标功能"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
 msgstr "不要读取文件（仅写入）"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <目录>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<目录>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "设定操作目录"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "保留XON (^Q) 和XOFF (^S) 按键"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
 msgstr "-r <#列数>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
 msgstr "--fill=<#列数>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "设定强制折行宽度为 #列数"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "设置强制换行宽度并进行重排"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <程序>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<程序>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "启用替代的拼写检查程序"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
 msgstr "离开时自动储存，不要提示"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
 msgstr "默认将文件保存为 Unix 格式"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
 msgstr "查看（只读）模式"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "不要为过长行强制折行"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "不要为过长行强制折行 [默认]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
 msgstr "不要显示辅助区"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
 msgstr "使 Ctrl+Right 在单词末尾处停止"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
 msgstr "启用挂起功能"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
 msgstr "启用软换行"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano，版本 %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s nano 贡献者\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
 msgstr " 电子邮件：nano@nano-editor.org\t网页：https://www.nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1904,327 +1914,346 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "无文件名"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
 msgstr "保存已修改的缓冲区？（回答“否”会丢弃所有修改。）"
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
 msgstr "正在从标准输入读取；输入 ^D 或 ^D^D 以结束。\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "打开标准输入失败：%s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对不起，无法从键盘设备重新打开标准输入\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
 msgstr "抱歉！Nano 崩溃了！代码：%d。请报告这个问题。\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用 \"fg\" 返回 nano\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
 msgstr "挂起功能未启用"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
 msgstr "已启用"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
 msgstr "已禁用"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
 msgstr "按键未绑定"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
 msgstr "不可绑定的按键：M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
 msgstr "按键未绑定：M-%c"
 
-#: src/nano.c:1572
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "不可绑定的按键：^["
+
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
 msgstr "按键未绑定：^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
 msgstr "按键未绑定：%c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "指导栏“%s”无效"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "选项 %s 已忽略；这是默认值\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的制表符宽度%s 无效"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填满行数\"%s\" 无效"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "输入“%s -h”以获取所有可用选项的列表。\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "非法的正则表达式 \"%s\": %s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
 msgstr "无效的列号或行号"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
 msgstr "“%s”中的错误"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
 msgstr "欢迎使用 nano。  如需基本帮助信息，请按下 Ctrl+G。"
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "否"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "全部"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
 msgstr "在 %s（第 %zu 行）中发生错误："
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "参数%s 有未封闭的 \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表达式字符串必须以 \" 字符开始及结束"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "非法的正则表达式 \"%s\": %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
 msgstr "缺少语法名称"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
 msgstr "语法名称中的未配对引用"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 语法已被保留"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
 msgstr "默认“default”语法不接受扩展"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
 msgstr "缺少键名称"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "键名称过短"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "键名称必须以“^”、“M”或“F”开始"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "键名称 %s 无效"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "必须指定键绑定到的功能"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr "必须指定一个要绑定/接触绑定按键的菜单（或“全部（all）”）"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "无法映射名字“%s”到一个功能"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射名字“%s”到一个菜单"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "功能“%s”在菜单“%s”中不存在"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "对不起，按键“%s”无法重新绑定"
+msgid "Keystroke %s may not be rebound"
+msgstr "按键 %s 无法重新绑定"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "展开 %s 出错：%s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
 msgstr "无法识别颜色“%s”"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "背景色不可为明亮"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
 msgstr "“%s”命令需要一个前导 \"syntax\" 命令"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "“%s”命令后缺少正则表达式字符串"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
 msgstr "空正则表达式字符串"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求对应的\"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
 msgstr "\"default\" 语法不接受“%s”正则表达式"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
 msgstr "“%s”后缺少参数"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
 msgstr "“%s”的参数缺少封闭的 \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
 msgstr "没有绑定到功能“%s”的按键（在菜单“%s”中）。退出。\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "如有需要，请在启动 nano 时带上 -I 选项以调整您的 nanorc 设置。\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "无法找到要扩展的语法“%s”"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法“%s”没有color 命令"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令“%s”被禁止在包含文件中使用"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别“%s”命令"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "缺少选项"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知选项“%s”"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "无法解除选项设定“%s”"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需要参数"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
 msgstr "参数并非有效的多字节字符串"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "需要非空格字符"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
 msgstr "需要两个单行字符"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目录！哇！"
 
@@ -2285,238 +2314,246 @@ msgstr "并非一个括号"
 msgid "No matching bracket"
 msgstr "无对应括号"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
 msgstr "标记设定"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
 msgstr "标记解除"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "调用 \"%s\" 错误"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
 msgstr "该文件类型不支持做注释"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
 msgstr "无法注释越过文件末尾"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "没有可撤销的操作！"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "文字增加"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "添加"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
-msgstr "换行符"
+msgstr "换行"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "文本删除"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "删除"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
 msgstr "行合并"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "文本替换"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "替换"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "清除"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "文字剪切"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "剪切"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "取消剪切"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "粘贴"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "文本插入"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "插入"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "缩进"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
 msgstr "取消缩进"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "注释"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
 msgstr "取消注释"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "已撤销操作(%s)"
+msgid "Undid %s"
+msgstr "已撤销 %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
 msgstr "没有可重做的操作！"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "已重做操作（%s）"
+msgid "Redid %s"
+msgstr "已重做 %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
 msgstr "无法创建管道"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
 msgstr "无法 fork"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "过滤"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
 msgstr "打开管道失败：%s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "不良的引用字符串 %s：%s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "对齐"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "已对齐选中内容"
+
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "已对齐文件"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "现在可以还原对齐！"
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "已对齐段落"
 
-#: src/text.c:2606
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
 msgstr "无法找到单词：%s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
 msgstr "编辑替代文字"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
 msgstr "下一个单词..."
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请稍待..."
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
 msgstr "无法获取管道缓冲区大小"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
 msgstr "调用 \"spell\" 错误"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
 msgstr "调用 \"sort -f\" 错误"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
 msgstr "调用 \"uniq\" 错误"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
 msgstr "拼写检查结束"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
 msgstr "没有为该类型文件而定义的代码语法检查器！"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "运行代码语法检查之前保存已修改的缓冲区吗？"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
 msgstr "正在调用代码语法检查器，请稍候"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "从命令 %s 获得了 0 行可解析的行"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "该信息对应于未打开的文件 %s，在新缓冲区打开它吗？"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "没有该文件的消息"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
 msgstr "在第一条消息"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "在最后一条消息"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
 msgstr "%s字数：%zu  行数：%zd  字符数：%zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
 msgstr "于选择部分："
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "原形输入"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
 msgstr "没有单词片段"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
 msgstr "没有更多匹配"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
 msgstr "没有匹配"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
-msgstr "nano 已耗尽内存！\n"
+msgstr "Nano 已耗尽内存！\n"
 
 #: src/winio.c:86
 msgid "Recording a macro..."
@@ -2540,79 +2577,125 @@ msgstr "标准输入含有太多错误\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
 msgstr "未知序列"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
 msgstr "Unicode 输入：%s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "语法检查中 --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
 msgstr "目录："
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
 msgstr "已更改"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
 msgstr "查看"
 
-#: src/winio.c:2232
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "受限"
+
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
 msgstr "更多的警告信息未显示"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "行 %zd/%zd (%d%%)，列 %zu/%zu (%d%%)，字符 %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "nano 文本编辑器"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
 msgstr "来自于："
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
 msgstr "特别感谢："
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "自由软件基金会"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "TP 项目和众多翻译人员"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
 msgstr "ncurses 部分："
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "以及其他我们不记得的人..."
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "感谢您使用 nano！"
 
+#~ msgid "Uncut Text"
+#~ msgstr "还原剪切"
+
+#~ msgid "Unjustify"
+#~ msgstr "还原对齐"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "从剪贴板粘贴至当前行"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "平滑式卷动画面"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "不要将换行加到文件末端"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "编辑时多使用一行"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "设定强制折行宽度为 #列数"
+
+#~ msgid "text add"
+#~ msgstr "文字增加"
+
+#~ msgid "text delete"
+#~ msgstr "文本删除"
+
+#~ msgid "text replace"
+#~ msgstr "文本替换"
+
+#~ msgid "text cut"
+#~ msgstr "文字剪切"
+
+#~ msgid "text uncut"
+#~ msgstr "取消剪切"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "不良的引用字符串 %s：%s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "现在可以还原对齐！"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "非多重缓冲区模式中此按键无效"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
@@ -1,15 +1,15 @@
 # Traditional Chinese Messages for the nano editor.
-# Copyright (C) 2004, 05 Free Software Foundation, Inc.
+# Copyright (C) 2004, 05, 13, 18, 19 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Wei-Lun Chao <bluebat@member.fsf.org>, 2004, 2005, 2013.
-# pan93412 <pan93412@gmail.com>, 2018.
+# pan93412 <pan93412@gmail.com>, 2018, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU nano 3.2-pre1\n"
+"Project-Id-Version: GNU nano 4.0-pre1\n"
 "Report-Msgid-Bugs-To: nano-devel@gnu.org\n"
-"POT-Creation-Date: 2018-11-11 16:51+0100\n"
-"PO-Revision-Date: 2018-11-07 19:49+0800\n"
+"POT-Creation-Date: 2019-03-24 12:45+0100\n"
+"PO-Revision-Date: 2019-03-12 20:46+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: src/browser.c:67
 #, c-format
@@ -28,11 +28,11 @@ msgstr "無法開啟目錄：%s"
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:228
 msgid "Go To Directory"
-msgstr "跳至目錄"
+msgstr "前往目錄"
 
-#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2154
-#: src/nano.c:1073 src/search.c:116 src/search.c:215 src/search.c:720
-#: src/search.c:772 src/text.c:3050 src/text.c:3241
+#: src/browser.c:231 src/browser.c:692 src/files.c:1131 src/files.c:2149
+#: src/nano.c:1076 src/search.c:116 src/search.c:215 src/search.c:720
+#: src/search.c:772 src/text.c:2814 src/text.c:3005
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -41,18 +41,18 @@ msgstr "已取消"
 #: src/browser.c:248 src/browser.c:279
 #, c-format
 msgid "Can't go outside of %s"
-msgstr "無法超出 %s 範圍"
+msgstr "不可超出 %s 範圍"
 
 #: src/browser.c:270
 msgid "Can't move up a directory"
 msgstr "無法上移一個目錄"
 
-#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1673
-#: src/files.c:1790 src/files.c:1832 src/files.c:1852 src/files.c:1965
-#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1208
+#: src/browser.c:285 src/files.c:1012 src/files.c:1018 src/files.c:1670
+#: src/files.c:1787 src/files.c:1829 src/files.c:1849 src/files.c:1962
+#: src/history.c:311 src/history.c:407 src/rcfile.c:531 src/rcfile.c:1218
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "讀取 %s 時發生錯誤: %s"
+msgstr "讀取 %s 時發生錯誤：%s"
 
 #: src/browser.c:369
 msgid "The working directory has disappeared"
@@ -81,31 +81,31 @@ msgstr "搜尋"
 
 #: src/browser.c:683 src/search.c:107
 msgid " [Backwards]"
-msgstr " [向後搜尋]"
+msgstr " [往後搜尋]"
 
 #: src/browser.c:722 src/browser.c:727 src/search.c:285
 msgid "Search Wrapped"
-msgstr "已從頭搜尋"
+msgstr "已從頭開始搜尋"
 
 #: src/browser.c:738 src/search.c:418
 msgid "This is the only occurrence"
-msgstr "這是惟一出現之處"
+msgstr "這是唯一出現之處"
 
 #: src/browser.c:784 src/search.c:359
 msgid "No current search pattern"
-msgstr "沒有符合目前搜尋形式者"
+msgstr "無符合搜尋樣式之結果"
 
-#: src/color.c:182
+#: src/color.c:184
 #, c-format
 msgid "Unknown syntax name: %s"
-msgstr "未知的語法名稱：%s"
+msgstr "語法名稱未知：%s"
 
-#: src/color.c:238
+#: src/color.c:240
 #, c-format
 msgid "magic_load() failed: %s"
 msgstr "magic_load() 錯誤：%s"
 
-#: src/color.c:242
+#: src/color.c:244
 #, c-format
 msgid "magic_file(%s) failed: %s"
 msgstr "magic_file(%s) 錯誤：%s"
@@ -138,38 +138,38 @@ msgstr "目錄「%s」唯讀"
 #. TRANSLATORS: Keep the next eight messages at most 76 characters.
 #: src/files.c:186
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr "無法確認我的身分以用於鎖定檔案 (getpwuid() 失敗)"
+msgstr "無法確定用於鎖定檔的個人身份（getpwuid() 執行失敗）"
 
 #: src/files.c:195
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "無法確認主機名稱以用於鎖定檔案：%s"
+msgstr "無法確定用於鎖定檔的主機名稱：%s"
 
 #: src/files.c:215 src/files.c:224 src/files.c:262 src/files.c:269
 #, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
+msgstr "寫入鎖定檔 %s 時發生錯誤：%s"
 
 #: src/files.c:291
 #, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "刪除鎖定檔案 %s 時發生錯誤：%s"
+msgstr "刪除鎖定檔 %s 時發生錯誤：%s"
 
 #: src/files.c:322
 #, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "開啟鎖定檔案 %s 時發生錯誤：%s"
+msgstr "開啟鎖定檔 %s 時發生錯誤：%s"
 
 #: src/files.c:336
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
-msgstr "讀取鎖定檔案 %s 時發生錯誤：未讀取足夠的資料"
+msgstr "讀取鎖定檔 %s 時發生錯誤：未讀取足夠的資料"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
 #: src/files.c:355
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %s); continue?"
-msgstr "檔案 %s 正在被編輯（來自 %s 與 %s、PID 為 %s）；繼續？"
+msgstr "檔案 %s 正被編輯（來自 %s 與 %s、PID 為 %s）；繼續？"
 
 #: src/files.c:429
 #, c-format
@@ -179,12 +179,12 @@ msgstr "無法讀取 %s 外的檔案"
 #: src/files.c:445 src/files.c:1002 src/rcfile.c:510
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" 是一個目錄"
+msgstr "「%s」為目錄"
 
 #: src/files.c:447
 #, c-format
 msgid "\"%s\" is not a normal file"
-msgstr "「%s」不是一個正常檔案"
+msgstr "「%s」非正常檔案"
 
 #: src/files.c:526 src/files.c:548 src/files.c:572 src/files.c:590
 msgid "spelling correction"
@@ -197,7 +197,7 @@ msgid "%s -- %zu line (%s)"
 msgid_plural "%s -- %zu lines (%s)"
 msgstr[0] "%s -- 第 %zu 行 (%s)"
 
-#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2096
+#: src/files.c:625 src/files.c:631 src/global.c:1035 src/winio.c:2091
 msgid "New Buffer"
 msgstr "新緩衝區"
 
@@ -217,7 +217,7 @@ msgstr[0] "%s -- 第 %zu 行"
 
 #: src/files.c:640
 msgid "No more open file buffers"
-msgstr "無多餘檔案緩衝區可開啟"
+msgstr "無其他已開啟檔案的緩衝區"
 
 #: src/files.c:933
 #, c-format
@@ -229,19 +229,19 @@ msgstr "檔案「%s」唯讀"
 #, c-format
 msgid "Read %zu line (Converted from DOS and Mac format)"
 msgid_plural "Read %zu lines (Converted from DOS and Mac format)"
-msgstr[0] "已讀取 %zu 列 (轉檔自 DOS 與 Mac 格式)"
+msgstr[0] "已讀取 %zu 列（轉檔自 DOS 與 Mac 格式）"
 
 #: src/files.c:942
 #, c-format
 msgid "Read %zu line (Converted from Mac format)"
 msgid_plural "Read %zu lines (Converted from Mac format)"
-msgstr[0] "已讀取 %zu 列 (轉檔自 Mac 格式)"
+msgstr[0] "已讀取 %zu 列（轉檔自 Mac 格式）"
 
 #: src/files.c:947
 #, c-format
 msgid "Read %zu line (Converted from DOS format)"
 msgid_plural "Read %zu lines (Converted from DOS format)"
-msgstr[0] "已讀取 %zu 列 (轉檔自 DOS 格式)"
+msgstr[0] "已讀取 %zu 列（轉檔自 DOS 格式）"
 
 #: src/files.c:953
 #, c-format
@@ -256,12 +256,12 @@ msgstr "新檔案"
 #: src/files.c:993
 #, c-format
 msgid "File \"%s\" not found"
-msgstr "找不到檔案「%s」"
+msgstr "未找到檔案「%s」"
 
 #: src/files.c:1003 src/rcfile.c:511
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" 是一個裝置檔案"
+msgstr "「%s」為裝置檔案"
 
 #: src/files.c:1021
 msgid "Reading File"
@@ -270,11 +270,11 @@ msgstr "正在讀取檔案"
 #. TRANSLATORS: The next six messages are prompts.
 #: src/files.c:1087
 msgid "Command to execute in new buffer"
-msgstr "在新緩衝區中執行的命令"
+msgstr "要在新緩衝區執行的指令"
 
 #: src/files.c:1090
 msgid "Command to execute"
-msgstr "執行的命令 "
+msgstr "要執行的指令"
 
 #: src/files.c:1098
 #, c-format
@@ -289,794 +289,792 @@ msgstr "將檔案讀入新的緩衝區 [來自 %s]"
 #: src/files.c:1106
 #, c-format
 msgid "File to insert unconverted [from %s]"
-msgstr "未轉換欲插入檔案 [來自 %s]"
+msgstr "要不轉換插入的檔案 [來自 %s]"
 
 #: src/files.c:1109
 #, c-format
 msgid "File to insert [from %s]"
-msgstr "所要插入的檔案 [從 %s]"
+msgstr "要插入的檔案 [從 %s]"
 
-#: src/files.c:1472
-msgid "Invalid operating directory\n"
-msgstr "無效的操作目錄\n"
+#: src/files.c:1467
+#, c-format
+msgid "Invalid operating directory: %s\n"
+msgstr "操作目錄無效：%s\n"
 
-#: src/files.c:1521
+#: src/files.c:1517
 msgid "Failed to write backup file; continue saving? (Say N if unsure.) "
-msgstr "寫入備份檔案時失敗；要繼續儲存？(如果不確定就以 N 表示。) "
+msgstr "寫入備份檔案失敗；繼續儲存？(若不確定則輸入 N。) "
 
-#: src/files.c:1538
-msgid "Invalid backup directory\n"
-msgstr "無效的備份目錄\n"
+#: src/files.c:1534
+#, c-format
+msgid "Invalid backup directory: %s\n"
+msgstr "備份目錄無效：%s\n"
 
-#: src/files.c:1631
+#: src/files.c:1628
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1709 src/files.c:1733 src/files.c:1751 src/files.c:1765
-#: src/files.c:1777 src/files.c:1800
+#: src/files.c:1706 src/files.c:1730 src/files.c:1748 src/files.c:1762
+#: src/files.c:1774 src/files.c:1797
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:1710 src/nano.c:660
+#: src/files.c:1707 src/nano.c:656
 msgid "Too many backup files?"
-msgstr "太多備份檔案？"
+msgstr "過多備份檔案？"
 
-#: src/files.c:1841 src/files.c:1863 src/help.c:55 src/help.c:122
-#: src/text.c:2967 src/text.c:2985
+#: src/files.c:1838 src/files.c:1860 src/help.c:55 src/help.c:122
+#: src/text.c:2731 src/text.c:2749
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "寫入暫存檔時發生錯誤：%s"
 
-#: src/files.c:1883 src/files.c:1893 src/files.c:1912 src/files.c:1929
-#: src/files.c:1939 src/files.c:1972 src/files.c:1981
+#: src/files.c:1880 src/files.c:1890 src/files.c:1909 src/files.c:1926
+#: src/files.c:1936 src/files.c:1969 src/files.c:1978
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:2031
+#: src/files.c:2028
 #, c-format
 msgid "Wrote %zu line"
 msgid_plural "Wrote %zu lines"
 msgstr[0] "已寫入 %zu 列"
 
-#: src/files.c:2114
+#: src/files.c:2109
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:2115
+#: src/files.c:2110
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:2116
+#: src/files.c:2111
 msgid " [Backup]"
 msgstr " [備份]"
 
 #. TRANSLATORS: The next six strings are prompts.
-#: src/files.c:2123
+#: src/files.c:2118
 msgid "Prepend Selection to File"
-msgstr "前引選擇部分於檔案"
+msgstr "將選取區域複製到檔案開頭"
 
-#: src/files.c:2124
+#: src/files.c:2119
 msgid "Append Selection to File"
-msgstr "附加選擇部分至檔案"
+msgstr "將選取區域複製至檔案結尾"
 
-#: src/files.c:2125
+#: src/files.c:2120
 msgid "Write Selection to File"
-msgstr "寫入選擇部分至檔案"
+msgstr "將選取區域寫入檔案"
 
-#: src/files.c:2127
+#: src/files.c:2122
 msgid "File Name to Prepend to"
-msgstr "要前引於的檔案名稱"
+msgstr "要前置內容的檔案名稱"
 
-#: src/files.c:2128
+#: src/files.c:2123
 msgid "File Name to Append to"
-msgstr "要附加至的檔案名稱"
+msgstr "要附加內容的檔案名稱"
 
-#: src/files.c:2131
+#: src/files.c:2126
 msgid "File Name to Write"
 msgstr "要寫入的檔案名稱"
 
 #. TRANSLATORS: Concisely say the screen is too small.
-#: src/files.c:2214
+#: src/files.c:2209
 msgid "Too tiny"
 msgstr "螢幕過小"
 
 #. TRANSLATORS: Restricted mode forbids overwriting.
-#: src/files.c:2244
+#: src/files.c:2239
 msgid "File exists -- cannot overwrite"
 msgstr "檔案已存在 -- 無法覆蓋"
 
-#: src/files.c:2254
+#: src/files.c:2249
 msgid "Save file under DIFFERENT NAME? "
-msgstr "以不同的名稱存檔？"
+msgstr "以不同名稱存檔？"
 
-#: src/files.c:2262
+#: src/files.c:2257
 #, c-format
 msgid "File \"%s\" exists; OVERWRITE? "
-msgstr "檔案「%s」已存在；要覆寫嗎？"
+msgstr "檔案「%s」已存在；是否覆寫？"
 
-#: src/files.c:2289
+#: src/files.c:2283
 msgid "File on disk has changed"
 msgstr "磁碟上的檔案已變更"
 
-#: src/files.c:2291
+#: src/files.c:2285
 msgid "File was modified since you opened it; continue saving? "
-msgstr "檔案從您開啟它後已被修改；要繼續儲存？"
+msgstr "檔案在您開啟後被修改過；是否繼續儲存？ "
 
-#: src/files.c:2711
+#: src/files.c:2703
 msgid "(more)"
 msgstr "(更多)"
 
-#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
-#: src/global.c:525
+#. TRANSLATORS: Try to keep the next two strings at most 10 characters.
+#: src/global.c:523
 msgid "Exit"
-msgstr "離開"
+msgstr "退出"
 
-#: src/global.c:526
+#: src/global.c:524
 msgid "Close"
 msgstr "關閉"
 
-#: src/global.c:527
-msgid "Uncut Text"
-msgstr "還原剪下文字"
-
-#: src/global.c:529
-msgid "Unjustify"
-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:538
+#: src/global.c:532
 msgid "Cancel the current function"
 msgstr "取消目前功能"
 
-#: src/global.c:539
+#: src/global.c:533
 msgid "Display this help text"
-msgstr "顯示這份說明文字"
+msgstr "顯示此說明內容"
 
-#: src/global.c:541
+#: src/global.c:535
 msgid "Close the current buffer / Exit from nano"
-msgstr "關閉目前緩衝區 / 離開 nano"
+msgstr "關閉目前緩衝區 / 退出 nano"
 
-#: src/global.c:543
+#: src/global.c:537
 msgid "Write the current buffer (or the marked region) to disk"
-msgstr "寫入目前緩衝區（或者是已標記區域）至磁碟"
+msgstr "將目前緩衝區（或已標記區域）寫入磁碟"
 
-#: src/global.c:545
+#: src/global.c:539
 msgid "Insert another file into current buffer (or into new buffer)"
-msgstr "插入其他檔案至目前緩衝區（或插入新的緩衝區）"
+msgstr "將其他檔案插入目前緩衝區（或插入新緩衝區）"
 
-#: src/global.c:547
+#: src/global.c:541
 msgid "Search forward for a string or a regular expression"
 msgstr "使用字串或正規表示式來向前搜尋"
 
-#: src/global.c:549
+#: src/global.c:543
 msgid "Search backward for a string or a regular expression"
-msgstr "使用字串或正規表示式來往回搜尋"
+msgstr "使用字串或正規表示式來向後搜尋"
 
-#: src/global.c:551
+#: src/global.c:545
 msgid "Search forward for a string"
 msgstr "向前搜尋一個字串"
 
-#: src/global.c:552
+#: src/global.c:546
 msgid "Search backward for a string"
 msgstr "向後搜尋一個字串"
 
-#: src/global.c:553
+#: src/global.c:547
 msgid "Refresh the file list"
 msgstr "重新整理檔案列表"
 
-#: src/global.c:555
+#: src/global.c:549
 msgid "Go to lefthand column"
-msgstr "跳至左欄"
+msgstr "前往左欄"
 
-#: src/global.c:556
+#: src/global.c:550
 msgid "Go to righthand column"
-msgstr "跳至右欄"
+msgstr "前往右欄"
 
-#: src/global.c:557
+#: src/global.c:551
 msgid "Go to first row in this column"
-msgstr "跳至此欄中的第一行"
+msgstr "前往此欄第一列"
 
-#: src/global.c:558
+#: src/global.c:552
 msgid "Go to last row in this column"
-msgstr "跳至此欄中的最後一列"
+msgstr "前往此欄最後一列"
 
-#: src/global.c:561
+#: src/global.c:555
 msgid "Go one screenful up"
-msgstr " 向上捲動一個畫面"
+msgstr "向上捲動一個畫面"
 
-#: src/global.c:562
+#: src/global.c:556
 msgid "Go one screenful down"
 msgstr "向下捲動一個畫面"
 
-#: src/global.c:564
+#: src/global.c:558
 msgid "Cut current line (or marked region) and store it in cutbuffer"
-msgstr "在剪貼板剪下目前的行（或選取的區域）並且儲存它"
+msgstr "剪下目前行（或選取區域）並在剪貼簿儲存該行"
 
-#: src/global.c:566
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "從剪貼簿還原至目前這列"
+#: src/global.c:560
+msgid "Paste the contents of cutbuffer at current cursor position"
+msgstr "在目前游標位置貼上剪貼簿的內容"
 
-#: src/global.c:567
+#: src/global.c:561
 msgid "Display the position of the cursor"
 msgstr "顯示游標位置"
 
-#: src/global.c:569
+#: src/global.c:563
 msgid "Invoke the spell checker, if available"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/global.c:571
+#: src/global.c:565
 msgid "Replace a string or a regular expression"
-msgstr "置換字串或正規表示式"
+msgstr "取代字串或正規表示式"
 
-#: src/global.c:572
+#: src/global.c:566
 msgid "Go to line and column number"
-msgstr "跳至指定列與行位置"
+msgstr "前往指定列與行碼"
 
-#: src/global.c:574
+#: src/global.c:568
 msgid "Mark text starting from the cursor position"
-msgstr "從游標開始標記文字"
+msgstr "從游標位置開始標記文字"
 
-#: src/global.c:576
+#: src/global.c:570
 msgid "Copy current line (or marked region) and store it in cutbuffer"
-msgstr "剪下目前的列（或選取的區域）並存至剪貼簿"
+msgstr "複製目前行（或選取區域）並在剪貼簿儲存該行"
 
-#: src/global.c:577
+#: src/global.c:571
 msgid "Throw away the current line (or marked region)"
-msgstr "丟除目前的行 (或選取區塊)"
+msgstr "刪除目前行（或選取區域）"
 
-#: src/global.c:578
+#: src/global.c:572
 msgid "Indent the current line (or marked lines)"
-msgstr "縮排目前這列（或選取的區域）"
+msgstr "縮排目前行（或選取區域）"
 
-#: src/global.c:579
+#: src/global.c:573
 msgid "Unindent the current line (or marked lines)"
-msgstr "取消目前這列（或選取的區域）的縮排"
+msgstr "移除目前行（或選取區域）的縮排"
 
-#: src/global.c:580
+#: src/global.c:574
 msgid "Undo the last operation"
-msgstr "復原上次的動作"
+msgstr "復原上個動作"
 
-#: src/global.c:581
+#: src/global.c:575
 msgid "Redo the last undone operation"
-msgstr "重做最後一筆已復原作業"
+msgstr "重作上一筆被復原的動作"
 
-#: src/global.c:583
+#: src/global.c:577
 msgid "Go back one character"
-msgstr "向後跳一字元"
+msgstr "往回跳一字元"
 
-#: src/global.c:584
+#: src/global.c:578
 msgid "Go forward one character"
-msgstr "向前跳一字元"
+msgstr "往前跳一字元"
 
-#: src/global.c:585
+#: src/global.c:579
 msgid "Go back one word"
-msgstr "向後跳一字詞"
+msgstr "往回跳一單詞"
 
-#: src/global.c:586
+#: src/global.c:580
 msgid "Go forward one word"
-msgstr "向前跳一字詞"
+msgstr "往前跳一單詞"
 
-#: src/global.c:587
+#: src/global.c:581
 msgid "Go to previous line"
-msgstr "跳至前一列"
+msgstr "前往上一列"
 
-#: src/global.c:588
+#: src/global.c:582
 msgid "Go to next line"
-msgstr "跳至後一列"
+msgstr "前往下一列"
 
-#: src/global.c:589
+#: src/global.c:583
 msgid "Go to beginning of current line"
-msgstr "跳至目前列首"
+msgstr "前往目前行首"
 
-#: src/global.c:590
+#: src/global.c:584
 msgid "Go to end of current line"
-msgstr "跳至目前列尾"
+msgstr "前往目前行尾"
 
-#: src/global.c:591
+#: src/global.c:585
 msgid "Go to previous block of text"
-msgstr "跳至前一塊文字"
+msgstr "前往前一塊文字"
 
-#: src/global.c:592
+#: src/global.c:586
 msgid "Go to next block of text"
-msgstr "跳至後一塊文字"
+msgstr "前往後一塊文字"
 
-#: src/global.c:595
+#: src/global.c:589
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "跳至目前段落開頭；然後是前一段落的開頭"
+msgstr "前往目前段落開頭；而後再跳前一段落的開頭"
 
-#: src/global.c:597
+#: src/global.c:591
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "跳至目前段落結尾；然後是後一段落的結尾"
+msgstr "前往目前段落結尾；而後再跳後一段落的結尾"
 
-#: src/global.c:599
+#: src/global.c:593
 msgid "Go to the first line of the file"
-msgstr "跳至檔案第一列"
+msgstr "前往檔案第一列"
 
-#: src/global.c:600
+#: src/global.c:594
 msgid "Go to the last line of the file"
-msgstr "跳至檔案最後一列"
+msgstr "前往檔案最後一列"
 
-#: src/global.c:602
+#: src/global.c:596
 msgid "Go to the matching bracket"
-msgstr "跳至對應的括號"
+msgstr "前往對應的括號"
 
-#: src/global.c:606
+#: src/global.c:600
 msgid "Scroll up one line without moving the cursor textually"
 msgstr "向上捲動一列而不捲動文字上的游標"
 
-#: src/global.c:608
+#: src/global.c:602
 msgid "Scroll down one line without moving the cursor textually"
 msgstr "向下捲動一列而不捲動文字上的游標"
 
-#: src/global.c:611
+#: src/global.c:605
 msgid "Switch to the previous file buffer"
 msgstr "切換至上個檔案緩衝區"
 
-#: src/global.c:612
+#: src/global.c:606
 msgid "Switch to the next file buffer"
 msgstr "切換至下個檔案緩衝區"
 
-#: src/global.c:614
+#: src/global.c:608
 msgid "Insert the next keystroke verbatim"
 msgstr "插入下個按鍵的原形"
 
-#: src/global.c:615
+#: src/global.c:609
 msgid "Insert a tab at the cursor position"
-msgstr "插入跳格字元於游標位置"
+msgstr "在游標位置插入定位字元 (Tab)"
 
-#: src/global.c:616
+#: src/global.c:610
 msgid "Insert a newline at the cursor position"
-msgstr "插入換列字元於游標位置"
+msgstr "在游標位置插入換行符號"
 
-#: src/global.c:617
+#: src/global.c:611
 msgid "Delete the character under the cursor"
 msgstr "刪除游標之下的字元"
 
-#: src/global.c:619
+#: src/global.c:613
 msgid "Delete the character to the left of the cursor"
 msgstr "刪除游標左側的字元"
 
-#: src/global.c:622
-msgid "Cut backward from cursor to word start"
-msgstr "從游標向後剪下至字的開頭"
+#: src/global.c:616
+msgid "Delete backward from cursor to word start"
+msgstr "刪除游標之前到單字開頭的內容"
 
-#: src/global.c:624
-msgid "Cut forward from cursor to next word start"
-msgstr "從游標向前剪下至下個字的開頭"
+#: src/global.c:618
+msgid "Delete forward from cursor to next word start"
+msgstr "刪除游標之後到下個單字開頭的內容"
 
-#: src/global.c:626
+#: src/global.c:620
 msgid "Cut from the cursor position to the end of the file"
-msgstr "從游標位置剪下至檔案結尾"
+msgstr "剪下游標位置至檔案結尾的內容"
 
-#: src/global.c:629
+#: src/global.c:623
 msgid "Justify the current paragraph"
 msgstr "對齊目前段落"
 
-#: src/global.c:630
+#: src/global.c:624
 msgid "Justify the entire file"
 msgstr "對齊整個檔案"
 
-#: src/global.c:634
+#: src/global.c:628
 msgid "Count the number of words, lines, and characters"
-msgstr "計算字數、列數與字元數"
+msgstr "計算字數、行數與字元數"
 
-#: src/global.c:637
+#: src/global.c:631
 msgid "Refresh (redraw) the current screen"
-msgstr "重新顯示目前畫面"
+msgstr "重新繪製目前畫面"
 
-#: src/global.c:639
+#: src/global.c:633
 msgid "Suspend the editor (if suspension is enabled)"
-msgstr "懸置編輯器 (如果懸置已啟用)"
+msgstr "暫停編輯器（若已啟用暫停功能）"
 
-#: src/global.c:641
+#: src/global.c:635
 msgid "Try and complete the current word"
-msgstr "嘗試完成目前的單字"
+msgstr "嘗試完成目前單字"
 
-#: src/global.c:645
+#: src/global.c:639
 msgid "Comment/uncomment the current line (or marked lines)"
-msgstr "註解 / 取消註解目前的列（或標記的列）"
+msgstr "註解或取消註解目前行（或標記行）"
 
-#: src/global.c:647
+#: src/global.c:641
 msgid "Save file without prompting"
 msgstr "儲存檔案而不經確認"
 
-#: src/global.c:648
+#: src/global.c:642
 msgid "Search next occurrence backward"
-msgstr "向後搜尋下一個結果"
+msgstr "往回搜尋下一個結果"
 
-#: src/global.c:649
+#: src/global.c:643
 msgid "Search next occurrence forward"
 msgstr "向前搜尋下一個結果"
 
-#: src/global.c:651
+#: src/global.c:645
 msgid "Start/stop recording a macro"
 msgstr "開始 / 停止錄製巨集"
 
-#: src/global.c:652
+#: src/global.c:646
 msgid "Run the last recorded macro"
 msgstr "執行上次錄製的巨集"
 
-#: src/global.c:655
+#: src/global.c:649
 msgid "Toggle the case sensitivity of the search"
-msgstr "切換搜尋的大小寫符合"
+msgstr "切換搜尋是否要符合大小寫"
 
-#: src/global.c:657
+#: src/global.c:651
 msgid "Reverse the direction of the search"
-msgstr "倒轉搜尋方向"
+msgstr "反轉搜尋方向"
 
-#: src/global.c:659
+#: src/global.c:653
 msgid "Toggle the use of regular expressions"
-msgstr "切換使用正規表示式"
+msgstr "切換是否使用正規表示式"
 
-#: src/global.c:662
+#: src/global.c:656
 msgid "Recall the previous search/replace string"
-msgstr "重用上次搜尋/置換字串"
+msgstr "重用上次搜尋 / 取代字串"
 
-#: src/global.c:664
+#: src/global.c:658
 msgid "Recall the next search/replace string"
-msgstr "重用下次搜尋/置換字串"
+msgstr "重用下次搜尋 / 取代字串"
 
-#: src/global.c:667
+#: src/global.c:661
 msgid "Toggle the use of DOS format"
-msgstr "切換使用 DOS 格式"
+msgstr "切換是否使用 DOS 格式"
 
-#: src/global.c:668
+#: src/global.c:662
 msgid "Toggle the use of Mac format"
-msgstr "切換使用 Mac 格式"
+msgstr "切換是否使用 Mac 格式"
 
-#: src/global.c:669
+#: src/global.c:663
 msgid "Toggle appending"
-msgstr "切換附加"
+msgstr "切換是否附加"
 
-#: src/global.c:670
+#: src/global.c:664
 msgid "Toggle prepending"
-msgstr "切換前置"
+msgstr "切換是否前置"
 
-#: src/global.c:671
+#: src/global.c:665
 msgid "Toggle backing up of the original file"
-msgstr "切換備份既有檔案"
+msgstr "切換是否備份既有檔案"
 
-#: src/global.c:672
+#: src/global.c:666
 msgid "Execute external command"
-msgstr "執行外部命令"
+msgstr "執行外部指令"
 
-#: src/global.c:674
+#: src/global.c:668
 msgid "Pipe the current buffer (or marked region) to the command"
-msgstr "將目前緩衝區（或者是已標記區域）管線 pipe 至指令"
+msgstr "將目前緩衝區（或已標記區域）透過管線傳入指令"
 
-#: src/global.c:675
+#: src/global.c:669
 msgid "Do not convert from DOS/Mac format"
-msgstr "不要從 DOS/Mac 格式轉檔"
+msgstr "不從 DOS/Mac 格式轉檔"
 
-#: src/global.c:678
+#: src/global.c:672
 msgid "Toggle the use of a new buffer"
-msgstr "切換使用新緩衝區"
+msgstr "切換是否使用新緩衝區"
 
-#: src/global.c:680
+#: src/global.c:674
 msgid "Close buffer without saving it"
 msgstr "關閉緩衝區而不儲存"
 
-#: src/global.c:682
+#: src/global.c:676
 msgid "Go to file browser"
-msgstr "呼叫檔案選單"
+msgstr "開啟檔案瀏覽器"
 
-#: src/global.c:683
+#: src/global.c:677
 msgid "Exit from the file browser"
-msgstr "從檔案選單離開"
+msgstr "退出檔案瀏覽器"
 
-#: src/global.c:684
+#: src/global.c:678
 msgid "Go to the first file in the list"
-msgstr "跳至列表中的第一個檔案"
+msgstr "前往列表中第一個檔案"
 
-#: src/global.c:685
+#: src/global.c:679
 msgid "Go to the last file in the list"
-msgstr "跳至列表中的最後一個檔案"
+msgstr "前往列表中最後一個檔案"
 
-#: src/global.c:686
+#: src/global.c:680
 msgid "Go to the previous file in the list"
-msgstr "跳至列表中的上一個檔案"
+msgstr "前往列表中上一個檔案"
 
-#: src/global.c:687
+#: src/global.c:681
 msgid "Go to the next file in the list"
-msgstr "跳至列表中的下一個檔案"
+msgstr "前往列表中下一個檔案"
 
-#: src/global.c:688
+#: src/global.c:682
 msgid "Go to directory"
-msgstr "跳至目錄"
+msgstr "前往目錄"
 
-#: src/global.c:691
+#: src/global.c:685
 msgid "Invoke the linter, if available"
 msgstr "嘗試呼叫 linter。"
 
-#: src/global.c:692
+#: src/global.c:686
 msgid "Go to previous linter msg"
-msgstr "跳至上一個 linter 訊息"
+msgstr "前往上一個 linter 訊息"
 
-#: src/global.c:693
+#: src/global.c:687
 msgid "Go to next linter msg"
-msgstr "跳至下一個 linter 訊息"
+msgstr "前往下一個 linter 訊息"
 
 #. TRANSLATORS: Try to keep the next ninety strings or so at most 10
 #. * characters.  Some strings may be longer -- run nano and see.
-#: src/global.c:708
+#: src/global.c:702
 msgid "Get Help"
-msgstr "求助"
+msgstr "取得說明"
 
-#: src/global.c:711 src/prompt.c:704
+#: src/global.c:705 src/prompt.c:695
 msgid "Cancel"
 msgstr "取消"
 
-#: src/global.c:724
+#: src/global.c:718
 msgid "Write Out"
-msgstr "輸出"
+msgstr "儲存"
 
-#: src/global.c:734 src/global.c:1050
+#: src/global.c:728 src/global.c:1050
 msgid "Read File"
-msgstr "讀檔"
+msgstr "讀取"
 
-#: src/global.c:741 src/global.c:777
+#: src/global.c:735 src/global.c:769
 msgid "Justify"
 msgstr "對齊"
 
-#: src/global.c:748 src/global.c:763 src/global.c:966
+#: src/global.c:742 src/global.c:757 src/global.c:859 src/global.c:970
 msgid "Refresh"
-msgstr "重新顯示"
+msgstr "重整"
 
-#: src/global.c:753 src/global.c:846
+#: src/global.c:747 src/global.c:835
 msgid "Where Is"
 msgstr "搜尋"
 
-#: src/global.c:756 src/global.c:816
+#: src/global.c:750 src/global.c:808
 msgid "Replace"
-msgstr "置換"
+msgstr "取代"
 
-#: src/global.c:760
+#: src/global.c:754
 msgid "Go To Dir"
-msgstr "跳至目錄"
+msgstr "前往目錄"
 
-#: src/global.c:767
+#: src/global.c:761
 msgid "Cut Text"
 msgstr "剪下文字"
 
-#: src/global.c:781
+#: src/global.c:764
+msgid "Paste Text"
+msgstr "貼上文字"
+
+#: src/global.c:773
 msgid "To Spell"
 msgstr "拼字檢查"
 
-#: src/global.c:786
+#: src/global.c:778
 msgid "Cur Pos"
 msgstr "游標位置"
 
-#: src/global.c:793 src/global.c:832 src/global.c:923 src/global.c:1005
+#: src/global.c:785 src/global.c:821 src/global.c:926
 msgid "Go To Line"
-msgstr "跳列"
+msgstr "跳行"
 
-#: src/global.c:798
+#: src/global.c:790
 msgid "Undo"
 msgstr "復原"
 
-#: src/global.c:800
+#: src/global.c:792
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:803
+#: src/global.c:795
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:805
+#: src/global.c:797
 msgid "Copy Text"
 msgstr "複製文字"
 
-#: src/global.c:809
+#: src/global.c:801
 msgid "Case Sens"
-msgstr "依大小寫"
+msgstr "區分大小寫"
 
-#: src/global.c:811
+#: src/global.c:803
 msgid "Regexp"
 msgstr "正規表示式"
 
-#: src/global.c:813
+#: src/global.c:805
 msgid "Backwards"
-msgstr "向後搜尋"
+msgstr "往回搜尋"
 
-#: src/global.c:819
+#: src/global.c:811
 msgid "No Replace"
-msgstr "不置換"
+msgstr "不取代"
 
-#: src/global.c:823
+#: src/global.c:815
 msgid "Older"
 msgstr "較舊"
 
-#: src/global.c:825
+#: src/global.c:817
 msgid "Newer"
 msgstr "較新"
 
-#: src/global.c:829 src/global.c:954
+#: src/global.c:825 src/global.c:957
 msgid "FullJstify"
 msgstr "全部對齊"
 
-#: src/global.c:837
+#: src/global.c:830
 msgid "To Bracket"
 msgstr "至 Bracket"
 
-#: src/global.c:841 src/global.c:1000
-msgid "Save"
-msgstr "儲存"
-
 #. TRANSLATORS: This starts a backward search.
-#: src/global.c:848 src/global.c:852
+#: src/global.c:837 src/global.c:843 src/global.c:857
 msgid "Where Was"
 msgstr "搜尋"
 
 #. TRANSLATORS: This refers to searching the preceding occurrence.
-#: src/global.c:855
+#: src/global.c:847
 msgid "Previous"
 msgstr "上個"
 
-#: src/global.c:857
+#: src/global.c:850 src/global.c:855
 msgid "Next"
 msgstr "下個"
 
 #. TRANSLATORS: This means move the cursor one character back.
-#: src/global.c:861 src/global.c:866
+#: src/global.c:864 src/global.c:869
 msgid "Back"
-msgstr "向後"
+msgstr "往回"
 
-#: src/global.c:863 src/global.c:868
+#: src/global.c:866 src/global.c:871
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:872
+#: src/global.c:875
 msgid "Prev Word"
 msgstr "前一個字"
 
-#: src/global.c:874
+#: src/global.c:877
 msgid "Next Word"
 msgstr "後一個字"
 
-#: src/global.c:877
+#: src/global.c:880
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:879
+#: src/global.c:882
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:882
+#: src/global.c:885
 msgid "Prev Line"
 msgstr "上列"
 
-#: src/global.c:884
+#: src/global.c:887
 msgid "Next Line"
 msgstr "下列"
 
-#: src/global.c:887
+#: src/global.c:890
 msgid "Scroll Up"
 msgstr "向上捲動"
 
-#: src/global.c:889
+#: src/global.c:892
 msgid "Scroll Down"
 msgstr "向下捲動"
 
-#: src/global.c:893
+#: src/global.c:896
 msgid "Prev Block"
 msgstr "前一個區塊"
 
-#: src/global.c:895
+#: src/global.c:898
 msgid "Next Block"
 msgstr "後一個區塊"
 
-#: src/global.c:898
+#: src/global.c:901
 msgid "Beg of Par"
 msgstr "段落開頭"
 
-#: src/global.c:900
+#: src/global.c:903
 msgid "End of Par"
 msgstr "段落結尾"
 
-#: src/global.c:904 src/global.c:1060
+#: src/global.c:907 src/global.c:1060
 msgid "Prev Page"
 msgstr "上頁"
 
-#: src/global.c:906 src/global.c:1062
+#: src/global.c:909 src/global.c:1062
 msgid "Next Page"
 msgstr "下頁"
 
-#: src/global.c:909
+#: src/global.c:912
 msgid "First Line"
 msgstr "首列"
 
-#: src/global.c:911
+#: src/global.c:914
 msgid "Last Line"
 msgstr "尾列"
 
-#: src/global.c:915
+#: src/global.c:918
 msgid "Prev File"
 msgstr "上個檔案"
 
-#: src/global.c:917
+#: src/global.c:920
 msgid "Next File"
 msgstr "下個檔案"
 
-#: src/global.c:927
+#: src/global.c:930
 msgid "Tab"
-msgstr "跳格鍵"
+msgstr "定位鍵 (Tab)"
 
-#: src/global.c:929
+#: src/global.c:932
 msgid "Enter"
-msgstr "輸入鍵"
+msgstr "Enter 鍵"
 
-#: src/global.c:932
+#: src/global.c:935
 msgid "Backspace"
-msgstr "退格鍵"
+msgstr "Backspace 鍵"
 
-#: src/global.c:934
+#: src/global.c:937
 msgid "Delete"
 msgstr "刪除鍵"
 
-#. TRANSLATORS: The next two strings refer to cutting words.
-#: src/global.c:945
-msgid "Cut Left"
-msgstr "切割左邊"
+#. TRANSLATORS: The next two strings refer to deleting words.
+#: src/global.c:948
+msgid "Chop Left"
+msgstr "裁斷左側內容"
 
-#: src/global.c:947
-msgid "Cut Right"
-msgstr "切割右邊"
+#: src/global.c:950
+msgid "Chop Right"
+msgstr "裁斷右側內容"
 
-#: src/global.c:949
+#: src/global.c:952
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:959
+#: src/global.c:962
 msgid "Word Count"
-msgstr "計算字數"
+msgstr "字數統計"
 
-#: src/global.c:963
+#: src/global.c:966
 msgid "Verbatim"
 msgstr "原形"
 
-#: src/global.c:969
+#: src/global.c:974
 msgid "Suspend"
-msgstr "懸置"
+msgstr "暫停"
 
-#: src/global.c:973
+#: src/global.c:978
 msgid "Indent"
 msgstr "縮排"
 
-#: src/global.c:975
+#: src/global.c:980
 msgid "Unindent"
-msgstr "還原縮排"
+msgstr "移除縮排"
 
-#: src/global.c:979
+#: src/global.c:984
 msgid "Comment Lines"
-msgstr "備註行"
+msgstr "註解該行"
 
-#: src/global.c:983
+#: src/global.c:988
 msgid "Complete"
 msgstr "完成"
 
-#: src/global.c:987
+#: src/global.c:992
 msgid "Record"
 msgstr "錄製"
 
-#: src/global.c:989
+#: src/global.c:994
 msgid "Run Macro"
 msgstr "執行巨集"
 
-#: src/global.c:992
+#: src/global.c:997
 msgid "Zap Text"
-msgstr "摧毀文字"
+msgstr "刪除文字"
 
-#: src/global.c:997
+#: src/global.c:1002
 msgid "To Linter"
-msgstr "至 Linter"
+msgstr "執行 Linter"
+
+#: src/global.c:1006
+msgid "Save"
+msgstr "儲存"
 
 #: src/global.c:1009
 msgid "Go To Text"
-msgstr "跳至文字"
+msgstr "前往文字"
 
 #: src/global.c:1013
 msgid "DOS Format"
@@ -1092,7 +1090,7 @@ msgstr "附加"
 
 #: src/global.c:1025
 msgid "Prepend"
-msgstr "前引"
+msgstr "前置"
 
 #: src/global.c:1028
 msgid "Backup File"
@@ -1104,15 +1102,15 @@ msgstr "未轉換"
 
 #: src/global.c:1044
 msgid "Execute Command"
-msgstr "執行命令"
+msgstr "執行指令"
 
 #: src/global.c:1047
 msgid "Pipe Text"
-msgstr "管線文字"
+msgstr "將文字傳入管線"
 
 #: src/global.c:1057
 msgid "To Files"
-msgstr "檔案選單"
+msgstr "開啟檔案瀏覽器"
 
 #: src/global.c:1065
 msgid "First File"
@@ -1120,7 +1118,7 @@ msgstr "第一個檔案"
 
 #: src/global.c:1067
 msgid "Last File"
-msgstr "最後的檔案"
+msgstr "最後一個檔案"
 
 #: src/global.c:1070
 msgid "Left Column"
@@ -1153,61 +1151,61 @@ msgstr "下一個 Lint 訊息"
 
 #. TRANSLATORS: The next fourteen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
-#: src/global.c:1398
+#: src/global.c:1408
 msgid "Help mode"
-msgstr "輔助模式"
+msgstr "說明模式"
 
-#: src/global.c:1400
+#: src/global.c:1410
 msgid "Constant cursor position display"
 msgstr "持續顯示游標位置"
 
-#: src/global.c:1402
-msgid "Smooth scrolling"
-msgstr "平滑式捲動畫面"
+#: src/global.c:1412
+msgid "Jumpy scrolling (per half-screen)"
+msgstr "跳躍式捲動（每次移動半個螢幕）"
 
-#: src/global.c:1404
+#: src/global.c:1414
 msgid "Soft wrapping of overlong lines"
-msgstr "軟換行過長的行"
+msgstr "虛擬換過長行"
 
-#: src/global.c:1406
+#: src/global.c:1416
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1408
+#: src/global.c:1418
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1410
+#: src/global.c:1420
 msgid "Smart home key"
 msgstr "智慧型 HOME 按鍵"
 
-#: src/global.c:1412
+#: src/global.c:1422
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1414
+#: src/global.c:1424
 msgid "Cut to end"
-msgstr "剪下至列尾"
+msgstr "剪至列尾"
 
-#: src/global.c:1416
+#: src/global.c:1426
 msgid "Hard wrapping of overlong lines"
-msgstr "硬換行過長的行"
+msgstr "實際換過長行"
 
-#: src/global.c:1418
+#: src/global.c:1428
 msgid "Conversion of typed tabs to spaces"
-msgstr "已輸入跳格符號至空白的轉換"
+msgstr "已將輸入的 Tab 轉換成空白"
 
-#: src/global.c:1420
+#: src/global.c:1430
 msgid "Mouse support"
 msgstr "滑鼠支援"
 
-#: src/global.c:1422
+#: src/global.c:1432
 msgid "Suspension"
-msgstr "懸置"
+msgstr "暫停"
 
-#: src/global.c:1424
+#: src/global.c:1434
 msgid "Line numbering"
-msgstr "標記列號"
+msgstr "標示行碼"
 
 #: src/help.c:299
 msgid ""
@@ -1221,13 +1219,13 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"搜尋命令輔助說明\n"
+"搜尋指令輔助說明\n"
 "\n"
-" 首先輸入您想要搜尋的字串或字元，然後按下輸入鍵 (Enter)。如果存在著 符合您所"
-"輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
+" 首先輸入您想要搜尋的字串或字元，然後按下 Enter 鍵。如果有符合您所輸入的文"
+"字，畫面就會更新到最符合搜尋字串的位置。\n"
 "\n"
-" 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
-"下輸入鍵則會履行前次的搜尋。"
+" 前次搜尋的字串將會顯示在搜尋提示後方的括號中。不輸入任何文字而直接按下 "
+"Enter 鍵則會執行前次搜尋。"
 
 #: src/help.c:308
 msgid ""
@@ -1237,10 +1235,10 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"如果您已經用標記選擇了一段文字 並進行搜尋替換，就只有在選擇文字中符合者將會被"
+"如果您已經用標記選取了一段文字並進行搜尋取代，就只有在選擇文字中符合者才會被"
 "替換。\n"
 "\n"
-" 以下的功能鍵可用於搜尋模式:\n"
+" 以下的功能鍵可用於搜尋模式：\n"
 "\n"
 
 #: src/help.c:314
@@ -1254,12 +1252,12 @@ 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:323
@@ -1276,11 +1274,12 @@ msgid ""
 msgstr ""
 "插入檔案輔助說明\n"
 "\n"
-" 先把檔案的名稱鍵入，它將會插入在目前緩衝區的游標所在之處。\n"
+" 先輸入檔案名稱，該檔案中的內容將會插入在目前緩衝區的游標所在之處。\n"
 "\n"
-" 如果您所編譯的 nano 支援多重檔案緩衝區，並且將此功能以命令列旗標 -F 或 --"
-"multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 將會被載入"
-"另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。 "
+" 如果您所編譯的 nano 支援多重檔案緩衝區，並使用 -F、--multibuffer 指令列旗"
+"標、Meta-F 開關或者 nanorc\n"
+" 檔案來啟用此功能的話，所插入的檔案將會被載入到獨立的緩衝區中（可利用 Meta-< "
+"和 > 在檔案緩衝區間切換）。"
 
 #: src/help.c:332
 msgid ""
@@ -1290,10 +1289,10 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"如果您需要另一個空的緩衝區，那就不要輸入任何檔名，或是在提示符號後鍵 入一個不"
-"存在的檔名，然後按下輸入鍵。\n"
+"如果您需要另一個空緩衝區，那就不要輸入任何檔名，或是在提示文字後輸入不存在的"
+"檔名後按下 Enter 鍵。\n"
 "\n"
-" 以下的功能鍵可用於插入檔案模式:\n"
+" 以下的功能鍵可用於插入檔案模式：\n"
 "\n"
 
 #: src/help.c:338
@@ -1313,13 +1312,13 @@ msgid ""
 msgstr ""
 "寫入檔案輔助說明\n"
 "\n"
-" 先鍵入您想要以此來儲存目前檔案的名稱，並按下輸入鍵來儲存檔案。\n"
+" 請先輸入您想要以什麼檔名來儲存目前檔案，並按下 Enter 儲存檔案。\n"
 "\n"
-" 如果已經用標記選擇了文字，那麼您將會被提示，只儲存標記部分到另外的檔 案。為"
-"了降低目前檔案只被其中部分覆寫的機會，在此模式下，目前的檔名不會 成為預設"
+" 如果已經用標記功能選取文字，那麼您將被提示只將部份選擇內容儲存成一個檔案。為"
+"了降低目前檔案只被其中部分覆寫的機會，在此模式下，目前的檔名不會成為預設"
 "值。\n"
 "\n"
-" 以下的功能鍵可用於寫入檔案模式: \n"
+" 以下的功能鍵可用於寫入檔案模式：\n"
 "\n"
 
 #: src/help.c:352
@@ -1337,11 +1336,11 @@ msgid ""
 msgstr ""
 "檔案選單輔助說明\n"
 "\n"
-" 檔案選單是用來視覺化瀏覽目錄結構，以選取要讀出或寫入的檔案。您可以 使用上下"
-"左右鍵或上頁/下頁來瀏覽，並用 S 或輸入鍵來選取所要的檔案或者 進入所選的目錄。"
-"要跳到上層時，選擇在檔案列表頂端名為 \"..\" 的目錄。\n"
+" 檔案選單是用來視覺化瀏覽目錄結構，以選取要讀出或寫入的檔案。您可以\n"
+" 使用上下左右鍵或上頁/下頁來瀏覽，並用 S 或 Enter 鍵來選取所要的檔案或者 進入"
+"所選的目錄。要跳到上層時，選擇在檔案列表頂端名為「..」的目錄。\n"
 "\n"
-" 以下的功能鍵可用於檔案選單: \n"
+" 以下的功能鍵可用於檔案選單：\n"
 "\n"
 
 #: src/help.c:365
@@ -1357,13 +1356,13 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"搜尋命令輔助說明\n"
+"搜尋指令輔助說明\n"
 "\n"
-" 首先輸入您想要搜尋的字串或字元，然後按下輸入鍵 (Enter)。如果存在著 符合您所"
-"輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
+" 首先輸入您想要搜尋的字串或字元，然後按下 Enter 鍵 (Enter)。如果存在著\n"
+" 符合您所輸入的文字，畫面就會更新到最合乎搜尋字串的位置。\n"
 "\n"
-" 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
-"下輸入鍵則會履行前次的搜尋。\n"
+" 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。\n"
+" 不輸入任何文字而直接按下 Enter 鍵則會履行前次的搜尋。\n"
 "\n"
 
 #: src/help.c:374
@@ -1386,14 +1385,14 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"跳至目錄輔助說明\n"
+"前往目錄輔助說明\n"
 "\n"
 " 先輸入您想要瀏覽的目錄名稱。\n"
 "\n"
-" 如果跳格補正的功能沒有被關閉，您可以利用跳格鍵 (TAB) 去 (嘗試) 自動 補正目錄"
-"名稱。\n"
+" 如果未關閉 Tab 完成的功能，\n"
+" 您可以利用 Tab 鍵 (嘗試) 自動完成目錄名稱。\n"
 "\n"
-" 以下的功能鍵可用於跳至目錄模式: \n"
+" 以下的功能鍵可用於前往目錄模式：\n"
 "\n"
 
 #: src/help.c:391
@@ -1411,11 +1410,12 @@ msgid ""
 msgstr ""
 "拼字檢查輔助說明\n"
 "\n"
-" 拼字檢查程式會檢查目前檔案中所有文字的拼法。當遇到一個未知的字，它會 被標記"
-"起來，並讓您編輯替代文字。對於目前檔案中每一個拼錯的字，都會顯示 置換的提示；"
-"或者，如果已經用標記選擇了文字的話，那就只作用於選取的文字 之中。\n"
+" 拼字檢查程式會檢查目前檔案中所有文字的拼法。\n"
+" 當遇到一個未知的字，它將被標記起來，並讓您編輯取代文字。\n"
+" 對於目前檔案中每一個拼錯的字，都會顯示取代的提示；\n"
+" 或者，如果已經用標記選擇了文字的話，那就只作用於選取的文字之中。\n"
 "\n"
-" 以下的功能鍵可用於拼字檢查模式: \n"
+" 以下的功能鍵可用於拼字檢查模式：\n"
 "\n"
 
 #: src/help.c:406
@@ -1427,11 +1427,12 @@ msgid ""
 "by '|' (the pipe symbol), the current contents of the buffer (or marked "
 "region) will be piped to the command.  "
 msgstr ""
-"執行指令 輔助說明\n"
+"執行指令輔助說明\n"
 "\n"
 " 這個模式允許您插入從 shell 執行之指令的輸出到目前的緩衝區 (或是插入到新的緩"
-"衝區)。若在指令之前加上「|」(pipe 管線符號)，則目前緩衝區的內容（或選取區塊）"
-"將會 pipe 到指令中。"
+"衝區)。\n"
+" 若在指令之前加上「|」(pipe 管線符號)，則目前緩衝區的內容（或選取區塊）將會 "
+"pipe 到指令中。"
 
 #: src/help.c:412
 msgid ""
@@ -1446,7 +1447,7 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-" 下列功能鍵可用於 執行指令 模式：\n"
+" 下列功能鍵可用於執行指令模式：\n"
 "\n"
 
 #: src/help.c:417
@@ -1460,8 +1461,8 @@ msgid ""
 msgstr ""
 "=== Linter ===\n"
 "\n"
-" 這個模式中，狀態列會顯示錯誤或警告訊息，且游標將會放在檔案中的對應位置。使"
-"用 PageUp 和 PageDown 按鈕可以切換到較新或較舊的訊息。\n"
+" 這個模式中，狀態列會顯示錯誤或警告訊息，且游標將會放在檔案中的對應位置。\n"
+" 使用 PageUp 和 PageDown 按鈕可以切換到較新或較舊的訊息。\n"
 "\n"
 
 #: src/help.c:422
@@ -1485,12 +1486,11 @@ msgid ""
 msgstr ""
 "nano 輔助說明\n"
 "\n"
-" nano 編輯器是設計來在功能性及易用性方面，模仿華盛頓大學的 Pico 文字 編輯器。"
-"它含有四個主要部分:頂列顯示程式版本、目前被編輯的檔案名稱， 以及是否這檔案已"
-"經更動過。接著是主要編輯區，顯示正在編輯的檔案。狀態 列位於倒數第三列，用來顯"
-"示重要的訊息。\n"
-"\n"
-" "
+" nano 編輯器是設計來在功能性及易用性方面模仿華盛頓大學的 Pico 文字編輯器。\n"
+" 它含有四個主要部分：頂列顯示程式版本、目前被編輯的檔案名稱，以及是否這檔案已"
+"經變更過。\n"
+" 接著是主要編輯區，用來顯示正在編輯的檔案。狀態列位於倒數第三列，用來顯示重要"
+"的訊息。"
 
 #: src/help.c:439
 msgid ""
@@ -1503,9 +1503,10 @@ msgid ""
 msgstr ""
 "底部的兩列顯示編輯器中最常用到的快捷鍵。\n"
 "\n"
-"快捷鍵的定義如下：控制鍵組 (Control-key) 序列是以一個帽子符號「^」表示，且可"
-"藉由使用 Ctrl 鍵或按兩下 Esc 鍵輸入。Meta-Key 序列是以「M-」符號表示，且可以"
-"藉由您的鍵盤設定來選擇使用 Alt、Cmd 或 Esc 鍵輸入。"
+" 快捷鍵的定義如下：控制鍵組 (Control-key) 序列是以一個帽子符號「^」表示，\n"
+" 且可藉由使用 Ctrl 鍵或按兩下 Esc 鍵輸入。\n"
+" Meta-Key 序列是以「M-」符號表示，\n"
+" 且可以藉由您的鍵盤設定來選擇使用 Alt、Cmd 或 Esc 鍵輸入。"
 
 #: src/help.c:446
 msgid ""
@@ -1515,13 +1516,13 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"另外，按 Esc 兩次 之後再鍵入從 000 到 255 之間的三位數字，則會輸入該 ASCII 碼"
-"對應的字 元。下列按鍵組合可用於主要編輯區，替代按鍵則顯示於括弧內:\n"
+"另外，按 Esc 兩次 之後再輸入從 000 到 255 之間的三位數字，則會輸入該 ASCII 碼"
+"對應的字元。下列按鍵組合可用於主要編輯區，替代按鍵則顯示於括弧內：\n"
 "\n"
 
 #: src/help.c:478 src/help.c:551
 msgid "enable/disable"
-msgstr "開啟/關閉"
+msgstr "啟用/停用"
 
 #: src/history.c:240
 #, c-format
@@ -1530,7 +1531,7 @@ msgid ""
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下輸入鍵以繼續\n"
+"按下 Enter 鍵繼續\n"
 
 #: src/history.c:283
 #, c-format
@@ -1538,8 +1539,8 @@ 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"
+"無法建立 %s 目錄：%s\n"
+"若要儲存/載入搜尋記錄或游標位置，則必須建立此目錄。\n"
 
 #: src/history.c:290
 #, c-format
@@ -1547,7 +1548,7 @@ 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"
+"路徑 %s 不是但必須是個目錄。\n"
 "Nano 將無法載入或儲存搜尋記錄或游標位置\n"
 
 #: src/history.c:380 src/history.c:389 src/history.c:471 src/history.c:493
@@ -1555,19 +1556,19 @@ msgstr ""
 msgid "Error writing %s: %s\n"
 msgstr "寫入 %s 時發生錯誤: %s\n"
 
-#: src/nano.c:537
+#: src/nano.c:533
 msgid "Key is invalid in view mode"
 msgstr "在檢視模式中，此按鍵無效。"
 
-#: src/nano.c:543
+#: src/nano.c:539
 msgid "This function is disabled in restricted mode"
-msgstr "這功能已經在限制模式中被停用"
+msgstr "這功能已在受限模式中停用"
 
-#: src/nano.c:551
+#: src/nano.c:547
 msgid "Help is not available"
-msgstr "說明不可用"
+msgstr "無法使用輔助說明"
 
-#: src/nano.c:654
+#: src/nano.c:650
 #, c-format
 msgid ""
 "\n"
@@ -1576,328 +1577,340 @@ msgstr ""
 "\n"
 "緩衝區已寫入 %s\n"
 
-#: src/nano.c:656
+#: src/nano.c:652
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"緩衝區未寫入至 %s: %s\n"
+"緩衝區未寫入至 %s：%s\n"
 
-#: src/nano.c:659
+#: src/nano.c:655
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"緩衝區未寫入: %s\n"
+"緩衝區未寫入：%s\n"
 
-#: src/nano.c:768
+#: src/nano.c:764
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n"
 "\n"
 msgstr ""
-"用法: nano [選項] [[+列數[,行數]] 檔案名稱]…\n"
+"用法: nano [選項] [[+行碼[,欄碼]] 檔名]…\n"
 "\n"
 
 #. TRANSLATORS: The next two strings are part of the --help output.
 #. * It's best to keep its lines within 80 characters.
-#: src/nano.c:771
+#: src/nano.c:767
 #, c-format
 msgid ""
 "To place the cursor on a specific line of a file, put the line number with\n"
 "a '+' before the filename.  The column number can be added after a comma.\n"
 msgstr ""
-"為了要擺放游標至一個檔案中指定的行，在檔案名稱之間放入一個「+」於行碼前面。\n"
-"欄碼可以在逗號後增加。\n"
+"若要將游標放在檔案的指定行中，請在檔案名稱前加上「+行碼」。\n"
+"可在「+行碼」加個逗號後加上要前往的欄碼。\n"
 
-#: src/nano.c:773
+#: src/nano.c:769
 #, c-format
 msgid ""
 "When a filename is '-', nano reads data from standard input.\n"
 "\n"
 msgstr ""
-"當檔案名稱為「-」，Nano 將從標準輸入內讀取資料\n"
+"當檔案名稱為「-」，Nano 將從標準輸入讀取資料\n"
 "\n"
 
-#: src/nano.c:774
+#: src/nano.c:770
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "選項\t\tGNU 長選項\t\t意義\n"
+msgstr "選項\t\tGNU 長選項\t\t功能\n"
 
 #. 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:778
+#: src/nano.c:774
 msgid "Enable smart home key"
-msgstr "開啟智慧型 HOME 按鍵功能"
+msgstr "開啟智慧型 HOME 按鍵"
 
-#: src/nano.c:780
+#: src/nano.c:776
 msgid "Save backups of existing files"
 msgstr "儲存既有檔案的備份"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "-C <dir>"
 msgstr "-C <目錄>"
 
-#: src/nano.c:781
+#: src/nano.c:777
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<目錄>"
 
-#: src/nano.c:782
+#: src/nano.c:778
 msgid "Directory for saving unique backup files"
-msgstr "用以儲存獨一備份檔案的目錄"
+msgstr "用來儲存唯一備份檔案的目錄"
 
-#: src/nano.c:785
+#: src/nano.c:781
 msgid "Use bold instead of reverse video text"
-msgstr "使用粗體以代替反白顯示文字"
+msgstr "使用粗體而非反白顯示文字"
 
-#: src/nano.c:787
+#: src/nano.c:783
 msgid "Convert typed tabs to spaces"
-msgstr "將已輸入的跳格符號轉換為空白"
+msgstr "將輸入的 Tab 符號轉換成空白字元"
 
-#: src/nano.c:792
+#: src/nano.c:788
 msgid "Read a file into a new buffer by default"
-msgstr "預設值為讀取一個檔案至新的緩衝區"
+msgstr "預設將檔案讀取至新緩衝區"
 
-#: src/nano.c:795
+#: src/nano.c:791
 msgid "Use (vim-style) lock files"
-msgstr "使用 (vim 形式) 鎖定檔案"
+msgstr "使用（vim 形式的）鎖定檔案"
 
-#: src/nano.c:800
+#: src/nano.c:796
 msgid "Log & read search/replace string history"
-msgstr "記錄與讀取 搜尋/置換 的歷史字串"
+msgstr "記錄並讀取「搜尋/取代」的字串歷史記錄"
 
-#: src/nano.c:803
+#: src/nano.c:799
 msgid "Don't look at nanorc files"
-msgstr "不要參考 nanorc 檔案"
+msgstr "請勿讀取 nanorc 檔案"
+
+#: src/nano.c:803
+msgid "Show a guiding bar at this column"
+msgstr "在此欄顯示指引欄"
 
 #: src/nano.c:806
 msgid "Fix numeric keypad key confusion problem"
-msgstr "修正數字鍵區按鍵混淆問題"
+msgstr "修正數字按鍵區混淆的問題"
 
-#: src/nano.c:808
-msgid "Don't add newlines to the ends of files"
-msgstr "不要將換列加到檔案末端"
+#: src/nano.c:809
+msgid "Don't add an automatic newline [default]"
+msgstr "不加上自動換行 [預設]"
 
-#: src/nano.c:811
+#: src/nano.c:813
 msgid "Trim tail spaces when hard-wrapping"
-msgstr "當使用硬換行，修剪後端的空白"
+msgstr "當使用實際折行時裁掉尾端空白"
 
-#: src/nano.c:815
+#: src/nano.c:817
 msgid "Don't convert files from DOS/Mac format"
 msgstr "不要從 DOS/Mac 格式轉檔"
 
-#: src/nano.c:817
-msgid "Use one more line for editing"
-msgstr "編輯時多使用一列"
-
-#: src/nano.c:821
+#: src/nano.c:822
 msgid "Log & read location of cursor position"
 msgstr "記錄 & 讀取游標所在位置"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "-Q <regex>"
-msgstr "-Q <正規表達式>"
+msgstr "-Q <正規表示式>"
 
-#: src/nano.c:824
+#: src/nano.c:825
 msgid "--quotestr=<regex>"
-msgstr "--quotestr=<正規表達式>"
+msgstr "--quotestr=<正規表示式>"
 
-#: src/nano.c:825
+#: src/nano.c:826
 msgid "Regular expression to match quoting"
-msgstr "匹配中括號的正規表達式"
+msgstr "括號中用來尋找符合文字的正規表示式"
 
-#: src/nano.c:828
+#: src/nano.c:829
 msgid "Restricted mode"
-msgstr "限制模式"
+msgstr "受限模式"
 
 #: src/nano.c:830
-msgid "Scroll by line instead of half-screen"
-msgstr "逐列捲動以代替半個畫面"
-
-#: src/nano.c:832
 msgid "-T <#cols>"
-msgstr "-T <#行數>"
+msgstr "-T <#行>"
 
-#: src/nano.c:832
+#: src/nano.c:830
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#行數>"
+msgstr "--tabsize=<#行>"
 
-#: src/nano.c:833
+#: src/nano.c:831
 msgid "Set width of a tab to #cols columns"
-msgstr "設定跳格寬度為 #行數"
+msgstr "設定 Tab 寬度為 #行"
 
-#: src/nano.c:834
+#: src/nano.c:832
 msgid "Do quick statusbar blanking"
-msgstr "狀態列快速閃動"
+msgstr "將狀態列快速清空"
 
-#: src/nano.c:835
+#: src/nano.c:833
 msgid "Print version information and exit"
 msgstr "顯示版本資訊並離開"
 
-#: src/nano.c:838
+#: src/nano.c:836
 msgid "Detect word boundaries more accurately"
-msgstr "更正確地偵測單字邊界"
+msgstr "使偵測單字邊界更準確"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "-X <str>"
 msgstr "-X <字串>"
 
-#: src/nano.c:839
+#: src/nano.c:837
 msgid "--wordchars=<str>"
 msgstr "--wordchars=<字串>"
 
-#: src/nano.c:840
+#: src/nano.c:838
 msgid "Which other characters are word parts"
-msgstr "哪些其他符號為單字部份"
+msgstr "哪些其他字元是單字的一部份"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "-Y <name>"
 msgstr "-Y <名稱>"
 
-#: src/nano.c:844
+#: src/nano.c:842
 msgid "--syntax=<name>"
 msgstr "--syntax=<名稱>"
 
-#: src/nano.c:845
+#: src/nano.c:843
 msgid "Syntax definition to use for coloring"
-msgstr "用於顏色的語法定義"
+msgstr "用於上色的語法定義"
 
-#: src/nano.c:848
+#: src/nano.c:846
 msgid "Let Bsp and Del erase a marked region"
-msgstr "使用 Bsp (Backspace) 和 Del (Delete) 擦除選取區塊"
+msgstr "使用 Bsp 和 Del 清除選取區塊"
 
-#: src/nano.c:849
+#: src/nano.c:847
 msgid "When soft-wrapping, do it at whitespace"
-msgstr "當使用軟換行，請在空白處進行"
+msgstr "當使用軟換行，請在空白處進行請在空白字元所在處進行虛擬換行"
+
+#: src/nano.c:850
+msgid "Automatically hard-wrap overlong lines"
+msgstr "自動實際折過長行"
 
-#: src/nano.c:851
+#: src/nano.c:852
 msgid "Constantly show cursor position"
 msgstr "持續顯示游標位置"
 
-#: src/nano.c:853
+#: src/nano.c:854
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "修正 退格鍵/刪除鍵 混淆問題"
+msgstr "修正 Backspace 和 Delete 鍵的混淆問題"
+
+#: src/nano.c:855
+msgid "Keep the line below the title bar empty"
+msgstr "保留標題列下一行的空白"
 
 #: src/nano.c:856
+msgid "Ensure that text ends with a newline"
+msgstr "確保文字以換行字元結尾"
+
+#: src/nano.c:859
 msgid "Show cursor in file browser & help text"
-msgstr "在檔案瀏覽器和說明文字中顯示游標"
+msgstr "在檔案瀏覽器和輔助說明中顯示游標"
 
-#: src/nano.c:858
+#: src/nano.c:861
 msgid "Show this help text and exit"
 msgstr "顯示這份說明文字並退出"
 
-#: src/nano.c:860
+#: src/nano.c:863
 msgid "Automatically indent new lines"
-msgstr "自動縮排新列"
+msgstr "自動縮排新行"
 
-#: src/nano.c:861
+#: src/nano.c:865
+msgid "Scroll per half-screen, not per line"
+msgstr "一次捲動半個螢幕而非一行"
+
+#: src/nano.c:867
 msgid "Cut from cursor to end of line"
 msgstr "從游標剪下至列尾"
 
-#: src/nano.c:864
+#: src/nano.c:870
 msgid "Show line numbers in front of the text"
-msgstr "顯示行號於文字前"
+msgstr "在文字前顯示行碼"
 
-#: src/nano.c:867
+#: src/nano.c:873
 msgid "Enable the use of the mouse"
 msgstr "開啟滑鼠功能"
 
-#: src/nano.c:869
+#: src/nano.c:875
 msgid "Do not read the file (only write it)"
-msgstr "不讀取這個檔案（只寫入檔案）"
+msgstr "請勿讀取此檔案（僅寫入檔案）"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "-o <dir>"
 msgstr "-o <目錄>"
 
-#: src/nano.c:871
+#: src/nano.c:877
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<目錄>"
 
-#: src/nano.c:872
+#: src/nano.c:878
 msgid "Set operating directory"
 msgstr "設定操作目錄"
 
-#: src/nano.c:874
+#: src/nano.c:880
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "保留 XON (^Q) 和 XOFF (^S) 按鍵"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "-r <#cols>"
-msgstr "-r <#行數>"
+msgstr "-r <#欄數>"
 
-#: src/nano.c:876
+#: src/nano.c:882
 msgid "--fill=<#cols>"
-msgstr "--fill=<#行數>"
+msgstr "--fill=<#欄數>"
 
-#: src/nano.c:877
-msgid "Set hard-wrapping point at column #cols"
-msgstr "設定硬換列點為 #行數"
+#: src/nano.c:883
+msgid "Set width for hard-wrap and justify"
+msgstr "設定實際折行的寬度並對齊"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "-s <prog>"
 msgstr "-s <程式>"
 
-#: src/nano.c:881
+#: src/nano.c:887
 msgid "--speller=<prog>"
 msgstr "--speller=<程式>"
 
-#: src/nano.c:882
+#: src/nano.c:888
 msgid "Enable alternate speller"
 msgstr "啟用替代的拼字檢查程式"
 
-#: src/nano.c:884
+#: src/nano.c:890
 msgid "Auto save on exit, don't prompt"
-msgstr "離開時自動儲存，不要提示"
+msgstr "退出時不經提示自動儲存"
 
-#: src/nano.c:886
+#: src/nano.c:892
 msgid "Save a file by default in Unix format"
-msgstr "預設值以 Unix 格式儲存檔案"
+msgstr "預設以 Unix 格式儲存檔案"
 
-#: src/nano.c:888
+#: src/nano.c:894
 msgid "View mode (read-only)"
-msgstr "觀看模式 (唯讀)"
+msgstr "檢視模式（唯讀）"
 
-#: src/nano.c:890
-msgid "Don't hard-wrap long lines"
-msgstr "不硬換行長行"
+#: src/nano.c:896
+msgid "Don't hard-wrap long lines [default]"
+msgstr "不實際折過長行 [預設]"
 
-#: src/nano.c:892
+#: src/nano.c:898
 msgid "Don't show the two help lines"
-msgstr "不要顯示兩說明列"
+msgstr "請勿顯示兩說明行"
 
-#: src/nano.c:894
+#: src/nano.c:900
 msgid "Make Ctrl+Right stop at word ends"
-msgstr "讓 Ctrl + Right 停在單詞尾端"
+msgstr "讓 Ctrl + 方向右鍵 停在單詞尾端"
 
-#: src/nano.c:897
+#: src/nano.c:903
 msgid "Enable suspension"
-msgstr "開啟懸置功能"
+msgstr "開啟暫停功能"
 
-#: src/nano.c:899
+#: src/nano.c:905
 msgid "Enable soft line wrapping"
-msgstr "開啟長列換列"
+msgstr "開啟虛擬折行功能"
 
-#: src/nano.c:911
+#: src/nano.c:917
 #, c-format
 msgid " GNU nano, version %s\n"
 msgstr " GNU nano，版本 %s\n"
 
-#: src/nano.c:914
+#: src/nano.c:920
 #, c-format
 msgid " (C) 2014-%s the contributors to nano\n"
 msgstr " (C) 2014-%s Nano 貢獻者\n"
 
-#: src/nano.c:915
+#: src/nano.c:921
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: https://nano-editor.org/"
-msgstr " 電子郵件: nano@nano-editor.org\t網頁: https://nano-editor.org/"
+msgstr " 電子郵件：nano@nano-editor.org\t網頁：https://nano-editor.org/"
 
-#: src/nano.c:916
+#: src/nano.c:922
 #, c-format
 msgid ""
 "\n"
@@ -1906,334 +1919,353 @@ msgstr ""
 "\n"
 " 編譯選項:"
 
-#: src/nano.c:1062
+#: src/nano.c:1065
 msgid "No file name"
 msgstr "沒有檔案名稱"
 
-#: src/nano.c:1064
+#: src/nano.c:1067
 msgid "Save modified buffer?  (Answering \"No\" will DISCARD changes.) "
-msgstr "儲存修改過的緩衝區？（回答「No」將會失去所有變更。）"
+msgstr "是否儲存修改過的緩衝區？（回答「No」將失去所有變更。） "
 
-#: src/nano.c:1111
+#: src/nano.c:1114
 #, c-format
 msgid "Reading from standard input; type ^D or ^D^D to finish.\n"
-msgstr "正在從標準輸入讀取；輸入 ^D 或 ^D^D 完成。\n"
+msgstr "正在從標準輸入讀取；輸入 ^D 或 ^D^D 停止讀取。\n"
 
-#: src/nano.c:1138
+#: src/nano.c:1141
 #, c-format
 msgid "Failed to open stdin: %s"
 msgstr "無法開啟標準輸入：%s"
 
-#: src/nano.c:1151
+#: src/nano.c:1154
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "無法重新開啟來自鍵盤的標準輸入，抱歉\n"
+msgstr "無法重新開啟鍵盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1232
+#: src/nano.c:1235
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1239
+#: src/nano.c:1242
 #, c-format
 msgid "Sorry! Nano crashed!  Code: %d.  Please report a bug.\n"
-msgstr "喔喔… 抱歉，Nano 當掉了！錯誤代碼：%d。請回報問題。\n"
+msgstr "抱歉，Nano 當掉了！錯誤代碼：%d。請回報此臭蟲。\n"
 
-#: src/nano.c:1255
+#: src/nano.c:1258
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "利用 \"fg\" 來回到 nano。\n"
+msgstr "請使用「fg」回到 nano。\n"
 
-#: src/nano.c:1276
+#: src/nano.c:1279
 msgid "Suspension is not enabled"
-msgstr "懸置尚未啟用"
+msgstr "尚未啟用暫停功能"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "enabled"
-msgstr "開啟"
+msgstr "啟用"
 
-#: src/nano.c:1408
+#: src/nano.c:1411
 msgid "disabled"
-msgstr "關閉"
+msgstr "停用"
 
-#: src/nano.c:1565
+#: src/nano.c:1568
 msgid "Unbound key"
-msgstr "未綁定的按鍵"
+msgstr "按鍵未綁定"
 
-#: src/nano.c:1568
+#: src/nano.c:1571
 msgid "Unbindable key: M-["
-msgstr "未綁定的按鍵：M-["
+msgstr "按鍵未綁定：M-["
 
-#: src/nano.c:1570
+#: src/nano.c:1573
 #, c-format
 msgid "Unbound key: M-%c"
-msgstr "未綁定的按鍵：M-%c"
+msgstr "按鍵未綁定：M-%c"
+
+#: src/nano.c:1575
+msgid "Unbindable key: ^["
+msgstr "無法綁定按鍵：^["
 
-#: src/nano.c:1572
+#: src/nano.c:1577
 #, c-format
 msgid "Unbound key: ^%c"
-msgstr "未指定的按鍵：^%c"
+msgstr "按鍵未指定：^%c"
 
-#: src/nano.c:1574
+#: src/nano.c:1579
 #, c-format
 msgid "Unbound key: %c"
-msgstr "未綁定按鍵：%c"
+msgstr "按鍵未綁定：%c"
 
-#: src/nano.c:2169 src/rcfile.c:1169
+#: src/nano.c:2143 src/rcfile.c:1125
+#, c-format
+msgid "Guide column \"%s\" is invalid"
+msgstr "指引欄「%s」無效"
+
+#: src/nano.c:2167 src/nano.c:2186
+#, c-format
+msgid "Option %s is ignored; it is the default\n"
+msgstr "已忽略 %s 選項；該選項為預設值\n"
+
+#: src/nano.c:2192 src/rcfile.c:1179
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "所要求的跳格寬度 \"%s\" 無效"
+msgstr "所請求的 Tab 寬度「%s」無效"
 
-#: src/nano.c:2249 src/rcfile.c:1108
+#: src/nano.c:2284 src/rcfile.c:1115
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "所要求的填滿行數 \"%s\" 無效"
+msgstr "所請求的填充長度「%s」無效"
 
-#: src/nano.c:2307
+#: src/nano.c:2331
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "輸入「%s -h」顯示可用的選項列表。\n"
 
-#: src/nano.c:2621 src/search.c:789
+#: src/nano.c:2508
+#, c-format
+msgid "Bad quoting regex \"%s\": %s\n"
+msgstr "引號中的正規表示式「%s」無效：%s\n"
+
+#: src/nano.c:2648 src/search.c:789
 msgid "Invalid line or column number"
-msgstr "無效的列號或行號"
+msgstr "行碼或欄碼無效"
 
-#: src/nano.c:2671
+#: src/nano.c:2703
 #, c-format
 msgid "Mistakes in '%s'"
-msgstr "「%s」發生錯誤"
+msgstr "「%s」中發現錯誤"
 
-#: src/nano.c:2677
+#: src/nano.c:2709
 msgid "Welcome to nano.  For basic help, type Ctrl+G."
-msgstr "歡迎使用 nano。若需基本說明，請按 Ctrl+G。"
+msgstr "歡迎使用 nano。請按 Ctrl+G 取得基本使用說明。"
 
 #. TRANSLATORS: For the next three strings, specify the starting letters
 #. * of the translations for "Yes"/"No"/"All".  The first letter of each of
 #. * these strings MUST be a single-byte letter; others may be multi-byte.
-#: src/prompt.c:665
+#: src/prompt.c:656
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:666
+#: src/prompt.c:657
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:667
+#: src/prompt.c:658
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:691
+#: src/prompt.c:682
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:695
+#: src/prompt.c:686
 msgid "No"
 msgstr "否"
 
-#: src/prompt.c:700
+#: src/prompt.c:691
 msgid "All"
 msgstr "全部"
 
-#: src/rcfile.c:152
+#: src/rcfile.c:157
 #, c-format
 msgid "Error in %s on line %zu: "
-msgstr "在 %s (位於第 %zu 列) 中發生錯誤: "
+msgstr "在 %s (位於第 %zu 行) 中發生錯誤："
 
-#: src/rcfile.c:203
+#: src/rcfile.c:208
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "引數 '%s' 有未封閉的 \""
 
-#: src/rcfile.c:228 src/rcfile.c:686 src/rcfile.c:738 src/rcfile.c:818
+#: src/rcfile.c:233 src/rcfile.c:691 src/rcfile.c:743 src/rcfile.c:823
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表示式字串必須以 \" 字元開始及結束"
 
-#: src/rcfile.c:254 src/search.c:47
+#: src/rcfile.c:258 src/search.c:47
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "不良的正規表示式 \"%s\": %s"
+msgstr "正規表示式「%s」無效: %s"
 
-#: src/rcfile.c:273
+#: src/rcfile.c:277
 msgid "Missing syntax name"
-msgstr "缺少語法名稱"
+msgstr "遺失語法名稱"
 
-#: src/rcfile.c:281
+#: src/rcfile.c:285
 msgid "Unpaired quote in syntax name"
-msgstr "語法名稱中的不成對引號"
+msgstr "語法名稱中發現不成對引號"
 
-#: src/rcfile.c:293
+#: src/rcfile.c:297
 msgid "The \"none\" syntax is reserved"
-msgstr "\"none\" 語法已被保留"
+msgstr "「none」語法被保留"
 
-#: src/rcfile.c:319
+#: src/rcfile.c:323
 msgid "The \"default\" syntax does not accept extensions"
-msgstr "\"default\" 語法不允許副檔名"
+msgstr "「default」語法不允許副檔名"
 
-#: src/rcfile.c:350
+#: src/rcfile.c:355
 msgid "Missing key name"
-msgstr "缺少語法名稱"
+msgstr "遺失按鍵名稱"
 
-#: src/rcfile.c:359 src/rcfile.c:370
+#: src/rcfile.c:364 src/rcfile.c:375
 msgid "Key name is too short"
 msgstr "按鍵名稱過短"
 
-#: src/rcfile.c:380
+#: src/rcfile.c:385
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr "按鍵名稱必須以 \"^\", \"M\", 或 \"F\" 開始"
+msgstr "按鍵名稱必須以 \"^\", \"M\", 或 \"F\" 開頭"
 
-#: src/rcfile.c:383
+#: src/rcfile.c:388
 #, c-format
 msgid "Key name %s is invalid"
 msgstr "按鍵名稱 %s 無效"
 
-#: src/rcfile.c:392
+#: src/rcfile.c:397
 msgid "Must specify a function to bind the key to"
 msgstr "必須指定按鍵所繫結的功能"
 
 #. TRANSLATORS: Do not translate the word "all".
-#: src/rcfile.c:403
+#: src/rcfile.c:408
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
-msgstr "必須指定一個目錄（或「all」（所有））以綁定 / 取消綁定按鍵"
+msgstr "必須指定一個選單（或「all」所有）以綁定 / 取消綁定按鍵"
 
-#: src/rcfile.c:421
+#: src/rcfile.c:426
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr "無法映射名稱「%s」到某一功能"
+msgstr "無法將名稱「%s」映射到某一功能"
 
-#: src/rcfile.c:428
+#: src/rcfile.c:433
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr "無法映射名稱「%s」到某一選單"
+msgstr "無法名稱「%s」映射到某一選單"
 
-#: src/rcfile.c:456
+#: src/rcfile.c:466
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr "功能「%s」不存在於目錄「%s」"
+msgstr "功能「%s」不存在於選單「%s」"
 
-#: src/rcfile.c:466
+#: src/rcfile.c:477
 #, c-format
-msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "抱歉，按鍵敲擊「%s」不應該被綁定"
+msgid "Keystroke %s may not be rebound"
+msgstr "不能綁定按鍵輸入「%s」"
 
-#: src/rcfile.c:562
+#: src/rcfile.c:567
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "展開 %s 時發生錯誤: %s"
 
-#: src/rcfile.c:602
+#: src/rcfile.c:607
 #, c-format
 msgid "Color \"%s\" not understood"
-msgstr "無法辨識顏色「%s」"
+msgstr "未知顏色「%s」"
 
-#: src/rcfile.c:618
+#: src/rcfile.c:623
 msgid "A background color cannot be bright"
 msgstr "背景顏色不能太亮"
 
-#: src/rcfile.c:650 src/rcfile.c:790 src/rcfile.c:850
+#: src/rcfile.c:655 src/rcfile.c:795 src/rcfile.c:855
 #, c-format
 msgid "A '%s' command requires a preceding 'syntax' command"
-msgstr "「%s」指令需要一個前置的 'syntax' 指令"
+msgstr "「%s」指令需要前置的 'syntax' 指令"
 
-#: src/rcfile.c:656
+#: src/rcfile.c:661
 msgid "Missing color name"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:666 src/rcfile.c:802
+#: src/rcfile.c:671 src/rcfile.c:807
 #, c-format
 msgid "Missing regex string after '%s' command"
 msgstr "在「%s」指令之後缺少正規表示式字串"
 
-#: src/rcfile.c:697 src/rcfile.c:748
+#: src/rcfile.c:702 src/rcfile.c:753
 msgid "Empty regex string"
-msgstr "空的正規表示式字串"
+msgstr "正規表示式字串為空"
 
-#: src/rcfile.c:732
+#: src/rcfile.c:737
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求對應的 \"end=\""
 
-#: src/rcfile.c:797
+#: src/rcfile.c:802
 #, c-format
 msgid "The \"default\" syntax does not accept '%s' regexes"
-msgstr "「default」語法不允許「%s」正規表達式"
+msgstr "「default」語法不允許「%s」正規表示式"
 
-#: src/rcfile.c:855
+#: src/rcfile.c:860
 #, c-format
 msgid "Missing argument after '%s'"
-msgstr "在「%s」之後缺少參數"
+msgstr "缺少「%s」之後的參數"
 
-#: src/rcfile.c:865
+#: src/rcfile.c:870
 #, c-format
 msgid "Argument of '%s' lacks closing \""
-msgstr "引數 '%s' 缺少關閉用的 \""
+msgstr "引數 '%s' 缺少閉合用的 \""
 
-#: src/rcfile.c:893
+#: src/rcfile.c:898
 #, c-format
 msgid "No key is bound to function '%s' in menu '%s'.  Exiting.\n"
-msgstr "沒有按鍵綁定到「%2$s」目錄中的「%1$s」功能。準備退出。\n"
+msgstr "沒有按鍵綁定到「%2$s」目錄中的「%1$s」功能。正在退出。\n"
 
-#: src/rcfile.c:896 src/rcfile.c:1258
+#: src/rcfile.c:901 src/rcfile.c:1261
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "假如需要，使用 nano 的 -I 選項來調整您的 nanorc 設定。\n"
 
-#: src/rcfile.c:950
+#: src/rcfile.c:955
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "無法找到要展開的語法「%s」"
+msgstr "未找到要展開的語法「%s」"
 
-#: src/rcfile.c:972 src/rcfile.c:1179
+#: src/rcfile.c:977 src/rcfile.c:1189
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "語法「%s」沒有任何顏色命令"
+msgstr "語法「%s」無顏色指令"
 
-#: src/rcfile.c:1002
+#: src/rcfile.c:1007
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "命令「%s」在包含的檔案中不允許"
+msgstr "指令「%s」在包含的檔案中不允許"
 
-#: src/rcfile.c:1017
+#: src/rcfile.c:1022
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "無法辨識 \"%s\" 命令"
+msgstr "無法辨識「%s」指令"
 
-#: src/rcfile.c:1029
+#: src/rcfile.c:1034
 msgid "Missing option"
 msgstr "缺少選項"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1048
 #, c-format
 msgid "Unknown option \"%s\""
-msgstr "未知的選項 \"%s\""
+msgstr "選項「%s」未知"
 
-#: src/rcfile.c:1052
+#: src/rcfile.c:1057
 #, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "無法取消選項 \"%s\""
+msgstr "無法取消設定選項「%s」"
 
-#: src/rcfile.c:1064
+#: src/rcfile.c:1069
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "選項 \"%s\" 要求引數"
+msgstr "選項「%s」需要參數"
 
-#: src/rcfile.c:1079
+#: src/rcfile.c:1084
 msgid "Argument is not a valid multibyte string"
-msgstr "參數不是一個有效的多位元組字串"
+msgstr "參數非有效的多位元字串"
 
-#: src/rcfile.c:1120 src/rcfile.c:1140 src/rcfile.c:1146
+#: src/rcfile.c:1132 src/rcfile.c:1150 src/rcfile.c:1156
 msgid "Non-blank characters required"
 msgstr "需要非空格字元"
 
-#: src/rcfile.c:1127
+#: src/rcfile.c:1138
 msgid "Two single-column characters required"
-msgstr "需要兩個單行字元"
+msgstr "需要兩個單欄字元"
 
-#: src/rcfile.c:1250
+#: src/rcfile.c:1253
 msgid "I can't find my home directory!  Wah!"
-msgstr "我找不到我的家目錄！哇！"
+msgstr "找不到家目錄！哇！"
 
 #. TRANSLATORS: The next four modify the search prompt.
 #: src/search.c:105
 msgid " [Case Sensitive]"
-msgstr " [符合大小寫]"
+msgstr " [區分大小寫]"
 
 #: src/search.c:106
 msgid " [Regexp]"
@@ -2241,11 +2273,11 @@ msgstr " [正規表示式]"
 
 #: src/search.c:109
 msgid " (to replace) in selection"
-msgstr " 在標記中(置換)"
+msgstr " 在選取區塊中（替換）"
 
 #: src/search.c:111
 msgid " (to replace)"
-msgstr " (置換)"
+msgstr " （替換）"
 
 #. TRANSLATORS: This is shown when searching takes
 #. * more than half a second.
@@ -2256,273 +2288,281 @@ msgstr "搜尋中…"
 #: src/search.c:394
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "找不到 \"%.*s%s\""
+msgstr "找不到「%.*s%s」"
 
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:587
 msgid "Replace this instance?"
-msgstr "置換這個？"
+msgstr "取代這個？"
 
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:709
 msgid "Replace with"
-msgstr "以此置換"
+msgstr "以此取代"
 
 #: src/search.c:740
 #, c-format
 msgid "Replaced %zd occurrence"
 msgid_plural "Replaced %zd occurrences"
-msgstr[0] "已置換 %zd 處"
+msgstr[0] "已取代 %zd 處"
 
 #. TRANSLATORS: This is a prompt.
 #: src/search.c:768
 msgid "Enter line number, column number"
-msgstr "輸入列號，行號"
+msgstr "輸入行碼和欄碼"
 
 #: src/search.c:957
 msgid "Not a bracket"
-msgstr "並非一個括號"
+msgstr "非括號"
 
 #: src/search.c:1018
 msgid "No matching bracket"
 msgstr "無對應括號"
 
-#: src/text.c:63
+#: src/text.c:57
 msgid "Mark Set"
-msgstr "標記設定"
+msgstr "設定標記"
 
-#: src/text.c:67
+#: src/text.c:61
 msgid "Mark Unset"
-msgstr "標記解除"
+msgstr "取消設定標記"
 
-#: src/text.c:77
+#: src/text.c:71
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "呼叫 \"%s\" 錯誤"
+msgstr "呼叫「%s」時發生錯誤"
 
-#: src/text.c:584
+#: src/text.c:387
 msgid "Commenting is not supported for this file type"
-msgstr "這個檔案類型不支援註記"
+msgstr "此檔案類型不支援備註功能"
 
-#: src/text.c:594
+#: src/text.c:397
 msgid "Cannot comment past end of file"
-msgstr "無法備註於檔案結尾"
+msgstr "無法在檔案結尾新增備註"
 
-#: src/text.c:717
+#: src/text.c:525
 msgid "Nothing in undo buffer!"
 msgstr "復原緩衝區中沒有任何東西！"
 
 #. TRANSLATORS: The next thirteen strings describe actions
 #. * that are undone or redone.  They are all nouns, not verbs.
-#: src/text.c:732 src/text.c:802 src/text.c:914 src/text.c:982
-msgid "text add"
-msgstr "文字加入"
+#: src/text.c:540 src/text.c:610 src/text.c:723 src/text.c:791
+msgid "addition"
+msgstr "新增"
 
-#: src/text.c:747 src/text.c:926
+#: src/text.c:555 src/text.c:735
 msgid "line break"
-msgstr "分列符號"
+msgstr "分行符號"
 
-#: src/text.c:759 src/text.c:939
-msgid "text delete"
-msgstr "文字刪除"
+#: src/text.c:567 src/text.c:748
+msgid "deletion"
+msgstr "刪除模式"
 
-#: src/text.c:769 src/text.c:952
+#: src/text.c:577 src/text.c:761
 msgid "line join"
-msgstr "列聯結"
+msgstr "行連結"
 
-#: src/text.c:788 src/text.c:967
-msgid "text replace"
-msgstr "文字置換"
+#: src/text.c:596 src/text.c:776
+msgid "replacement"
+msgstr "取代模式"
 
-#: src/text.c:806 src/text.c:986
+#: src/text.c:614 src/text.c:795
 msgid "erasure"
 msgstr "擦除"
 
-#: src/text.c:811 src/text.c:991
-msgid "text cut"
-msgstr "文字剪下"
+#. TRANSLATORS: Remember: these are nouns, NOT verbs.
+#: src/text.c:620 src/text.c:800
+msgid "cut"
+msgstr "剪下"
 
-#: src/text.c:815 src/text.c:995
-msgid "text uncut"
-msgstr "文字取消剪下"
+#: src/text.c:624 src/text.c:804
+msgid "paste"
+msgstr "貼上"
 
-#: src/text.c:819 src/text.c:999
-msgid "text insert"
-msgstr "文字插入"
+#: src/text.c:628 src/text.c:808
+msgid "insertion"
+msgstr "插入"
 
-#: src/text.c:846 src/text.c:1017
+#: src/text.c:655 src/text.c:826
 msgid "indent"
 msgstr "縮排"
 
-#: src/text.c:850 src/text.c:1021
+#: src/text.c:659 src/text.c:830
 msgid "unindent"
-msgstr "還原縮排"
+msgstr "移除縮排"
 
-#: src/text.c:855 src/text.c:1026
+#: src/text.c:664 src/text.c:835
 msgid "comment"
 msgstr "備註"
 
-#: src/text.c:859 src/text.c:1030
+#: src/text.c:668 src/text.c:839
 msgid "uncomment"
-msgstr "解除備註"
+msgstr "移除備註"
 
-#: src/text.c:868
+#: src/text.c:677
 #, c-format
-msgid "Undid action (%s)"
-msgstr "已復原動作 (%s)"
+msgid "Undid %s"
+msgstr "已復原 %s"
 
-#: src/text.c:893
+#: src/text.c:702
 msgid "Nothing to re-do!"
-msgstr "沒有任何東西可重做！"
+msgstr "沒有任何東西可重作！"
 
-#: src/text.c:1039
+#: src/text.c:848
 #, c-format
-msgid "Redid action (%s)"
-msgstr "已重做動作 (%s)"
+msgid "Redid %s"
+msgstr "已重作 %s"
 
-#: src/text.c:1172 src/text.c:2684 src/text.c:3058
+#: src/text.c:981 src/text.c:2448 src/text.c:2822
 msgid "Could not create pipe"
-msgstr "無法建立管線功能"
+msgstr "無法建立管線"
 
-#: src/text.c:1208 src/text.c:2773 src/text.c:2889 src/text.c:3095
+#: src/text.c:1017 src/text.c:2537 src/text.c:2653 src/text.c:2859
 msgid "Could not fork"
-msgstr "執行功能無效"
+msgstr "無法 fork"
 
-#: src/text.c:1227 src/text.c:1279
+#: src/text.c:1036 src/text.c:1088
 msgid "filtering"
 msgstr "正在篩選"
 
-#: src/text.c:1273
+#: src/text.c:1082
 #, c-format
 msgid "Failed to open pipe: %s"
-msgstr "無法開啟管線 pipe：%s"
+msgstr "無法開啟管線：%s"
 
-#: src/text.c:2149
-#, c-format
-msgid "Bad quote string %s: %s"
-msgstr "不良引用字串 %s: %s"
+#: src/text.c:2127 src/text.c:2248
+msgid "justification"
+msgstr "對齊"
+
+#: src/text.c:2270
+msgid "Justified selection"
+msgstr "已對齊選取區域"
 
-#: src/text.c:2453
-msgid "Can now UnJustify!"
-msgstr "現在可以還原對齊！"
+#: src/text.c:2274
+msgid "Justified file"
+msgstr "已對齊檔案"
 
-#: src/text.c:2606
+#: src/text.c:2276
+msgid "Justified paragraph"
+msgstr "已對齊段落"
+
+#: src/text.c:2370
 #, c-format
 msgid "Unfindable word: %s"
-msgstr "無法搜尋的單字：%s"
+msgstr "單字無法搜尋：%s"
 
-#: src/text.c:2622
+#: src/text.c:2386
 msgid "Edit a replacement"
-msgstr "編輯替代文字"
+msgstr "編輯取代文字"
 
 #. TRANSLATORS: Shown after fixing misspellings in one word.
-#: src/text.c:2635
+#: src/text.c:2399
 msgid "Next word..."
-msgstr "下一個字…"
+msgstr "下一單字…"
 
-#: src/text.c:2686
+#: src/text.c:2450
 msgid "Creating misspelled word list, please wait..."
-msgstr "正在建立錯字列表，請稍待…"
+msgstr "正在建立錯字列表，請稍候…"
 
-#: src/text.c:2779 src/text.c:3102
+#: src/text.c:2543 src/text.c:2866
 msgid "Could not get size of pipe buffer"
-msgstr "無法得知管線緩衝區大小"
+msgstr "無法取得管線緩衝區的大小"
 
-#: src/text.c:2833
+#: src/text.c:2597
 msgid "Error invoking \"spell\""
-msgstr "呼叫 \"spell\" 錯誤"
+msgstr "呼叫「spell」時發生錯誤"
 
-#: src/text.c:2836
+#: src/text.c:2600
 msgid "Error invoking \"sort -f\""
-msgstr "呼叫 \"sort -f\" 錯誤"
+msgstr "呼叫「sort -f」時發生錯誤"
 
-#: src/text.c:2839
+#: src/text.c:2603
 msgid "Error invoking \"uniq\""
-msgstr "呼叫 \"uniq\" 錯誤"
+msgstr "呼叫「uniq」時發生錯誤"
 
-#: src/text.c:3007
+#: src/text.c:2771
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "拼字檢查失敗: %s"
+msgstr "拼字檢查失敗：%s"
 
-#: src/text.c:3009
+#: src/text.c:2773
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "拼字檢查失敗: %s: %s"
+msgstr "拼字檢查失敗：%s: %s"
 
-#: src/text.c:3012
+#: src/text.c:2776
 msgid "Finished checking spelling"
-msgstr "拼字檢查結束"
+msgstr "拼字檢查完成"
 
-#: src/text.c:3037
+#: src/text.c:2801
 msgid "No linter defined for this type of file!"
-msgstr "沒有這個檔案類型的 Linter 被定義！"
+msgstr "未定義此類型檔案的 Linter！"
 
-#: src/text.c:3047
+#: src/text.c:2811
 msgid "Save modified buffer before linting?"
 msgstr "在 Lint 之前儲存已修改過的緩衝區？"
 
-#: src/text.c:3064
+#: src/text.c:2828
 msgid "Invoking linter, please wait"
-msgstr "調用 linter 中，請稍候"
+msgstr "正在呼叫 linter，請稍候"
 
-#: src/text.c:3196
+#: src/text.c:2960
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr "從指令中取得 0 個可解析的行：%s"
+msgstr "在指令中取得 0 個可解析的行：%s"
 
-#: src/text.c:3234
+#: src/text.c:2998
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
-msgstr "這個訊息是為了未開啟的檔案 %s，在新緩衝區開啟它？"
+msgstr "這個訊息關於未開啟的檔案 %s，是否在新緩衝區開啟此檔？"
 
-#: src/text.c:3273
+#: src/text.c:3037
 msgid "No messages for this file"
 msgstr "沒有此檔案的訊息"
 
-#: src/text.c:3320
+#: src/text.c:3084
 msgid "At first message"
-msgstr "第一個訊息"
+msgstr "第一則訊息"
 
-#: src/text.c:3329
+#: src/text.c:3093
 msgid "At last message"
 msgstr "最近的訊息"
 
-#: src/text.c:3415
+#: src/text.c:3179
 #, c-format
 msgid "%sWords: %zu  Lines: %zd  Chars: %zu"
-msgstr "%s字數：%zu  行： %zd 位元組：%zu"
+msgstr "%s字數：%zu  行：%zd 位元組：%zu"
 
-#: src/text.c:3416
+#: src/text.c:3180
 msgid "In Selection:  "
-msgstr "於選擇部分: "
+msgstr "於選取區塊："
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3429
+#: src/text.c:3193
 msgid "Verbatim Input"
 msgstr "原形輸入"
 
-#: src/text.c:3530
+#: src/text.c:3290
 msgid "No word fragment"
-msgstr "無單詞片段"
+msgstr "未找到單詞片段"
 
-#: src/text.c:3622
+#: src/text.c:3382
 msgid "No further matches"
-msgstr "沒有其他符合項目"
+msgstr "未找到其他符合項目"
 
 #. TRANSLATORS: Shown when there are zero possible completions.
-#: src/text.c:3626
+#: src/text.c:3386
 msgid "No matches"
-msgstr "找不到符合結果"
+msgstr "未找到符合項目"
 
-#: src/utils.c:352 src/utils.c:364
+#: src/utils.c:315 src/utils.c:327
 msgid "Nano is out of memory!\n"
 msgstr "nano 已用盡記憶體！\n"
 
 #: src/winio.c:86
 msgid "Recording a macro..."
-msgstr "錄製巨集中…"
+msgstr "正在錄製巨集…"
 
 #: src/winio.c:89
 msgid "Stopped recording"
@@ -2538,83 +2578,129 @@ msgstr "巨集為空"
 
 #: src/winio.c:207
 msgid "Too many errors from stdin\n"
-msgstr "太多來自標準輸入的錯誤\n"
+msgstr "過多來自標準輸入的錯誤\n"
 
 #. TRANSLATORS: This refers to a sequence of escape codes
 #. * (from the keyboard) that nano does not recognize.
-#: src/winio.c:1344
+#: src/winio.c:1352
 msgid "Unknown sequence"
-msgstr "未知的序列"
+msgstr "序列未知"
 
 #. TRANSLATORS: This is shown while a six-digit hexadecimal
 #. * Unicode character code (%s) is being typed in.
-#: src/winio.c:1483
+#: src/winio.c:1491
 #, c-format
 msgid "Unicode Input: %s"
-msgstr "萬國碼輸入：%s"
+msgstr "萬國碼 Unicode 輸入：%s"
 
-#. TRANSLATORS: The next four are "labels" in the title bar.
-#: src/winio.c:2074
+#. TRANSLATORS: The next five are "labels" in the title bar.
+#: src/winio.c:2069
 msgid "Linting --"
 msgstr "Lint 中 --"
 
-#: src/winio.c:2080
+#: src/winio.c:2075
 msgid "DIR:"
-msgstr "目錄:"
+msgstr "目錄："
 
-#: src/winio.c:2101 src/winio.c:2105
+#: src/winio.c:2096 src/winio.c:2102
 msgid "Modified"
-msgstr "已更動"
+msgstr "已變更"
 
-#: src/winio.c:2103
+#: src/winio.c:2098
 msgid "View"
-msgstr "觀看"
+msgstr "檢視"
+
+#: src/winio.c:2100
+msgid "Restricted"
+msgstr "受限模式"
 
-#: src/winio.c:2232
+#: src/winio.c:2229
 msgid "Further warnings were suppressed"
-msgstr "更多錯誤已經抑制"
+msgstr "已隱藏更多錯誤"
 
-#: src/winio.c:3400
+#: src/winio.c:3431
 #, c-format
 msgid "line %zd/%zd (%d%%), col %zu/%zu (%d%%), char %zu/%zu (%d%%)"
 msgstr "列 %zd/%zd (%d%%), 行 %zu/%zu (%d%%), 字元 %zu/%zu (%d%%)"
 
-#: src/winio.c:3592
+#: src/winio.c:3623
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3593
+#: src/winio.c:3624
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3594
+#: src/winio.c:3625
 msgid "Brought to you by:"
-msgstr "來自於:"
+msgstr "來自於："
 
-#: src/winio.c:3595
+#: src/winio.c:3626
 msgid "Special thanks to:"
-msgstr "特別感謝:"
+msgstr "特別感謝："
 
-#: src/winio.c:3596
+#: src/winio.c:3627
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3597
+#: src/winio.c:3628
 msgid "the many translators and the TP"
 msgstr "許多的翻譯者與 TP"
 
-#: src/winio.c:3598
+#: src/winio.c:3629
 msgid "For ncurses:"
-msgstr "ncurses 部分:"
+msgstr "ncurses 部分："
 
-#: src/winio.c:3599
+#: src/winio.c:3630
 msgid "and anyone else we forgot..."
 msgstr "以及其他我們不記得的人…"
 
-#: src/winio.c:3600
+#: src/winio.c:3631
 msgid "Thank you for using nano!"
 msgstr "謝謝您使用 nano﹗"
 
+#~ msgid "Uncut Text"
+#~ msgstr "還原剪下文字"
+
+#~ msgid "Unjustify"
+#~ msgstr "還原對齊"
+
+#~ msgid "Uncut from the cutbuffer into the current line"
+#~ msgstr "從剪貼簿還原至目前這列"
+
+#~ msgid "Smooth scrolling"
+#~ msgstr "平滑式捲動畫面"
+
+#~ msgid "Don't add newlines to the ends of files"
+#~ msgstr "不要將換列加到檔案末端"
+
+#~ msgid "Use one more line for editing"
+#~ msgstr "編輯時多使用一列"
+
+#~ msgid "Set hard-wrapping point at column #cols"
+#~ msgstr "設定硬換列點為 #行數"
+
+#~ msgid "text add"
+#~ msgstr "文字加入"
+
+#~ msgid "text delete"
+#~ msgstr "文字刪除"
+
+#~ msgid "text replace"
+#~ msgstr "文字置換"
+
+#~ msgid "text cut"
+#~ msgstr "文字剪下"
+
+#~ msgid "text uncut"
+#~ msgstr "文字取消剪下"
+
+#~ msgid "Bad quote string %s: %s"
+#~ msgstr "不良引用字串 %s: %s"
+
+#~ msgid "Can now UnJustify!"
+#~ msgstr "現在可以還原對齊！"
+
 #~ msgid "Key invalid in non-multibuffer mode"
 #~ msgstr "非多重緩衝區模式中此按鍵無效"