diff --git a/ChangeLog b/ChangeLog
index 7fd4872ecc04be655b1aa14246d7591af08a1009..88d1d5bbff618804c80567fdaa074a60785b151e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+GNU nano 2.4.0  - 2015.03.22
 2015-03-22  Benno Schulenberg  <bensberg@justemail.net>
 	* src/chars.c (move_mbleft): Start looking for a multibyte char
 	not at the start of the string, but only as far back as such a
diff --git a/NEWS b/NEWS
index 3eeec9be526c076a9c4f6137c7263b4c087a3a5c..a09edfea12b84e7e8675eab2142402b4d2607ecd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2015.03.22 - GNU nano 2.4.0 "lizf" is released.  This is the first
+		stable release in many years, and brinds together many
+		new features from the 2.3 series: including:
+		a fully functional undo system (now enabled by default),
+		vim-compatible file locking, linter support, formatter
+		support, syntax highlighting flexibility, and many fixes
+		for issues reported since 2.2.  Many sincere thanks
+		to all of the bug reports, patches, well wishes and
+		contributions from everyone who has continued to
+		support us.  Thank you for using nano!
+
+
 2015.02.27 - GNU nano 2.3.99pre3 "Ashley" is released.  This is likely
 		to be the last release before the next major (2.4.0)
 		release.  Please test it out and send us any feedback
diff --git a/configure.ac b/configure.ac
index b6146c1ea6c8a895dd2a64f07e6721f49e2c606a..f806b11d4556e691fe6413dde43923a8004a85c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.3.99pre3-svn], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.4.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
diff --git a/po/bg.po b/po/bg.po
index f1ba2287e3418286fcf22c2b7b1ab28dd2812e0a..20e6b53480594292f45dfd8dd5941a71bd2c005b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2006-08-25 00:56+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Отиване в директория"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
@@ -37,7 +37,7 @@ msgstr "Не може да се излезе от %s в ограничен ре
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
@@ -60,20 +60,20 @@ msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Търсене"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Търсене отначало"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Това е единственото съвпадение"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Няма въведен низ за търсене"
 
@@ -212,12 +212,12 @@ msgstr "Нов файл"
 msgid "\"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директория"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за устройство"
@@ -277,8 +277,8 @@ msgstr "Твърде много резервни копия?"
 msgid "Error writing %s: %s"
 msgstr "Грешка при запис на %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при записа на временен файл: %s"
@@ -1664,17 +1664,17 @@ msgid "Enable soft line wrapping"
 msgstr "Автоматично пренасяне"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, версия %s (компилиран в %s часа на %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Е-поща: nano@nano-editor.org\tИнтернет адрес: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1683,68 +1683,68 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "За съжаление поддръжката за тази функция е изключена"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Запазване на променения буфер? (ПРИ ОТГОВОР „Не“ ПРОМЕНИТЕ ЩЕ СЕ ЗАГУБЯТ)"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи се SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да се върнете в nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Неизвестна команда"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "„XON“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "„XOFF“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Поисканият размер на табулация „%s“ е неправилен"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Поисканият размер „%s“ за максимална дължина на редове е неправилен"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1786,8 +1786,8 @@ msgstr "Грешка в %s на ред %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Низовете за регулярни изрази трябва да започват и завършват със символа \""
@@ -1841,22 +1841,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1871,129 +1871,129 @@ msgstr ""
 "„black“, с възможна представка „bright“\n"
 "за цветове на преден план."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изисква съответстващ „end=“"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Цветът за фон „%s“ не може да бъде ярък"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Липсва низът за регулярния израз"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Не може да бъде добавена команда за цвят без синтактична команда"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Командата „%s“ не е позволена във вмъкван файл"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксисът „%s“ няма команди за цветове"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизвестна"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Липсва името на цвета"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опцията „%s“ изисква аргумент"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опцията не е правилен многобайтов низ"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Необходими са символи, които не са празни"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Необходими са два символа с нормална ширина"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не може да се отмени флаг „%s“"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Неизвестен флаг „%s“"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не може да бъде намерена домашната директория! Ах!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2008,38 +2008,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ не е намерен"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Зачитане на малки/големи]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Рег.израз]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (за замяна) в избрания текст"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за замяна)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Замяна на това съвпадение?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замяна с"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2047,20 +2047,20 @@ msgstr[0] "Заменено е %lu съвпадение"
 msgstr[1] "Заменени са %lu съвпадения"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и стълб"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Не е скоба"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Няма съвпадаща скоба"
 
@@ -2076,9 +2076,9 @@ msgstr "Отменено е маркирането"
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2133,22 +2133,17 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Неуспех при създаването на pipe"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Неуспех при fork"
 
@@ -2173,7 +2168,7 @@ msgstr "Редактиране на замяна"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на списък със сгрешени думи, изчакайте..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не може да се определи размера на буфера на pipe"
 
@@ -2189,91 +2184,91 @@ msgstr "Грешка при извикване на „sort -f“"
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверката на правописа завърши"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Извикване на програмата за проверка на правописа"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Неуспех при проверката на правописа: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Неуспех при проверката на правописа: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Без знак за нов ред в края на файловете"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Показва тази справка"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В избрания текст: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Дословен вход"
 
diff --git a/po/ca.po b/po/ca.po
index 69f7c7ab5a541ce0665ded78d7415506894f4170..d38c5fbf5e4e71281ee9fafa92ba779fc54d8336 100644
--- 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 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the nano package.
 #
 # Miquel Vidal <miquel@sindominio.net>, 2001.
-# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014.
+# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-21 23:46+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:50+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Vés a un directori"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
@@ -37,7 +37,7 @@ msgstr "No es pot anar fora de %s en mode restringit"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "S'ha produït un error en llegir %s: %s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr "(directori pare)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cerca"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Recerca recomençada"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Aquesta és la única coincidència"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
@@ -114,7 +114,7 @@ msgstr ""
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "El fitxer %s s'està editant (per %s amb %s, PID %d); voleu continuar?"
 
 #: src/files.c:308
 #, c-format
@@ -230,12 +230,12 @@ msgstr "Nou fitxer"
 msgid "\"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
@@ -298,8 +298,8 @@ msgstr "Massa fitxers de còpia de seguretat?"
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
@@ -764,9 +764,8 @@ msgid "Go to next linter msg"
 msgstr "Vés al missatge següent de l'analitzador"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Invoca l'analitzador sintàctic, si està disponible"
+msgstr "Invoca el formatador, si està disponible"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -802,9 +801,8 @@ msgid "To Linter"
 msgstr "Analitzador"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Format DOS"
+msgstr "Formatador"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1668,15 +1666,15 @@ msgstr "Habilita l'ajustament suau de línies"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versió %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versió %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correu-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1685,67 +1683,67 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "El suport per a aquesta funció està inhabilitat"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Cap nom de fitxer"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No s'ha pogut tornar a obrir l'entrada estàndard des del teclat\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "S'està llegint des de l'entrada estàndard, ^C per a avortar-ho\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empreu «fg» per a tornar al nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "L'ordre és desconeguda"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, blah, blah"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, blah, blah"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Introduïu «%s -h» per obtenir una llista de les opcions disponibles.\n"
@@ -1787,8 +1785,8 @@ msgstr "Error en %s en la línia %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Les cadenes d'expressió regular han de començar i acabar amb un caràcter \""
@@ -1842,22 +1840,22 @@ msgstr "No es pot assignar el nom «%s» a una funció"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "No es pot assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La funció «%s» no existeix al menú «%s»"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La combinació «%s» no es pot reassignar"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "S'ha produït un error en expandir %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1872,66 +1870,64 @@ msgstr ""
 "«black», amb el prefix opcional «bright»\n"
 "per als colors de primer pla."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "No es pot afegir una ordre de color sense una ordre de sintaxi"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Manca la cadena d'expreg"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "El color de fons «%s» no pot ser brillant"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "No es pot afegir una expreg de cadena de «magic» sense una ordre de sintaxi"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Manca el nom de cadena de «magic»"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "No es pot afegir un analitzador sense una ordre de sintaxi"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Manca l'ordre de l'analitzador"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "No es pot afegir un analitzador sense una ordre de sintaxi"
+msgstr "No es pot afegir un formatador sense una ordre de sintaxi"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Manca l'ordre de l'analitzador"
+msgstr "Manca l'ordre del formatador"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Error fatal: no hi ha lletres asignades per a la funció «%s». S'està "
 "sortint.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1939,62 +1935,62 @@ msgstr ""
 "Si és necessari, empreu el nano amb l'opció -I  per a ajustar les vostres "
 "preferències.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "No s'ha trobat la sintaxi «%s» a estendre"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "L'ordre «%s» no es pot utilitzar a un fitxer inclós"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Manca l'opció"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opció no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "No es pot desestablir l'opció «%s»"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "L'opció «%s» és desconeguda"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "No s'ha pogut trobar el directori d'usuari! Ai!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2009,38 +2005,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» no trobat"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Maj/Min]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Cap Enrere]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (a reemplaçar) dins de la selecció"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Voleu reemplaçar aquesta instància?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplaça amb"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2048,19 +2044,19 @@ msgstr[0] "S'ha reemplaçat %lu coincidència"
 msgstr[1] "S'han reemplaçat %lu coincidències"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduïu el número de línia, número de columna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "El número de línia o columna és invàlid"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No és una clau"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
@@ -2076,11 +2072,11 @@ msgstr "Marca esborrada"
 msgid "Nothing in undo buffer!"
 msgstr "No hi ha res al búfer de desfer."
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Error intern: no hi ha coincidència per a la línia %ld. Deseu el vostre "
+"Error intern: no hi ha coincidència per a la línia %d. Deseu el vostre "
 "treball."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2132,24 +2128,17 @@ msgstr "No hi ha res a refer."
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Error intern: no es pot configurar el desfer. Deseu el vostre treball."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Error intern: no hi ha coincidència per a la línia %d. Deseu el vostre "
-"treball."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "S'ha refet l'acció (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
@@ -2175,7 +2164,7 @@ msgstr "Edita un reemplaçament"
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "No s'ha pogut obtindre la mida de la memòria intermèdia del conducte"
 
@@ -2191,89 +2180,88 @@ msgstr "S'ha produït un error en iniciar «sort -f»"
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "S'està invocant el corrector ortogràfic, espereu"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "No hi ha cap analitzador definit per a aquest tipus de fitxer!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Voleu desar el búfer abans d'analitzar-ho?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "S'esta invocant l'analitzador, espereu"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "S'han rebut 0 línies analitzables de l'ordre: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Aquest missatge és pel fitxer no obert %s, voleu obrir-lo en un nou búfer?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "A l'últim missatge"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Al primer missatge"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no s'ha definit un formatador"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Finalitzat"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "S'esta invocant l'analitzador, espereu"
+msgstr "S'esta invocant el formatador, espereu"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Ha finalitzat el format"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Entrada textual"
 
@@ -2337,7 +2325,7 @@ msgstr "La Fundació per al Software Lliure (FSF)"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "els molts traductors i el TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2351,6 +2339,11 @@ msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error intern: no hi ha coincidència per a la línia %ld. Deseu el vostre "
+#~ "treball."
+
 #~ msgid "line wrap"
 #~ msgstr "ajustament de línies llargues"
 
diff --git a/po/cs.po b/po/cs.po
index ad6cbf7b06ac0cc880bd96153244c881b873b2b2..ed6fd279ea9f884fea760da828fd8b9ac355c0ff 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-07-19 16:10+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -25,8 +25,8 @@ msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Zrušeno"
 
@@ -38,7 +38,7 @@ msgstr "V omezeném režimu nelze jít mimo %s"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Chyba při čtení: %s: %s"
@@ -60,20 +60,20 @@ msgid "(parent dir)"
 msgstr "(rodičovský adresář)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Hledat"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Hledání dokončeno"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Toto je jediný výskyt"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Žádný současný vzor hledání"
 
@@ -238,12 +238,12 @@ msgstr "Nový soubor"
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je soubor zařízení"
@@ -307,8 +307,8 @@ msgstr "Příliš mnoho zálohovacích souborů?"
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu dočasného souboru s: %s"
@@ -1675,18 +1675,18 @@ msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU verze nano %s (sestaveno %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 "Adresa elektronické pošty: nano@nano-editor.org\tWWW: http://www.nano-editor."
 "org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1695,68 +1695,68 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Promiňte, ale tato funkce není podporována"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Žádný název souboru"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Uložit změněnou vyrovnávací paměť (odpověď \"Ne\" zahodí změny)?"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Obvyklý vstup (stdin) se z klávesnice znovu otevřít nepodařilo. Promiňte\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Čte se z obvyklého vstupu (stdin), ^C k pro přerušení\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Neznámý příkaz"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON nebrán na vědomí, huhňání"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF nebrán na vědomí, huhňání"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Pište '%s -h' pro seznam dostupných voleb.\n"
@@ -1798,8 +1798,8 @@ msgstr "Chyba v %s na řádku %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukončené \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Řetězce znaků pro regulární výrazy musí začínat a končit znakem \""
 
@@ -1853,22 +1853,22 @@ msgstr "Nelze spojit název \"%s\" s funkcí"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nelze spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkce '%s' neexistuje v nabídce '%s'"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Promiňte, ale klávesu \"%s\" nelze znovu přiřadit"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Chyba při rozšíření %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1884,64 +1884,64 @@ msgstr ""
 "a „black“ (černá), s volitelnou předponou „bright“ (světlá)\n"
 "pro barvy popředí."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nelze přidat pokyn pro barvu bez příkazu pro skladbu"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Chybí řetězec regulárního výrazu"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nelze přidat regulární výraz pro záhlaví bez příkazu pro skladbu"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Nelze přidat regulární výraz kouzelného řetězce bez příkazu pro skladbu"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Chybí název kouzelného řetězce"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Chybí příkaz pro statický rozbor"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Chybí příkaz pro statický rozbor"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Závažná chyba: S funkcí \"%s\" není spojena žádná klávesová zkratka.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1949,62 +1949,62 @@ msgstr ""
 "Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-li změnit "
 "svá nastavení nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nepodařilo se najít skladbu \"%s\" k rozšíření"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Chybějící volba"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Volba není žádným platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Nelze vypnout volbu \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznámá volba \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2019,38 +2019,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nenalezen"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Rozlišovat velikost písmen]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [regulární výraz]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Zpět]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (k nahrazení) ve výběru"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (k nahrazení)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Nahradit tento případ?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Nahradit"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2059,19 +2059,19 @@ msgstr[1] "Nahrazeny %lu výskyty"
 msgstr[2] "Nahrazeno %lu výskytů"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zadat číslo řádku, číslo sloupce"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Neplatné číslo řádku nebo, číslo sloupce"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Žádná závorka"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
@@ -2087,11 +2087,11 @@ msgstr "Značka odstraněna"
 msgid "Nothing in undo buffer!"
 msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Vnitřní chyba: Nelze nalézt shodu pro řádek %ld. Uložte, prosím, svou práci."
+"Vnitřní chyba: Nelze nalézt shodu pro řádek %d. Uložte, prosím, svou práci."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2143,23 +2143,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Vnitřní chyba: Nelze připravit \"provést znovu\". Uložte, prosím, svou práci."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Vnitřní chyba: Nelze nalézt shodu pro řádek %d. Uložte, prosím, svou práci."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
@@ -2186,7 +2180,7 @@ msgstr "Upravit nahrazení"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nepodařilo se získat velikost vyrovnávací paměti přenosu dat"
 
@@ -2202,90 +2196,90 @@ msgstr "Chyba při vyvolání „sort -f“"
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokončeno"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Vyvolat ověření správného psaní. Počkejte, prosím"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Pro tento typ souboru není stanoven žádný statický rozbor!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Volá se statický rozbor. Počkejte, prosím"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Příkaz %s nevytvořil žádný zpracovatelný řádek"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Tato zpráva se týká neotevřeného souboru %s. Otevřít v nové vyrovnávací "
 "paměti?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Při poslední zprávě"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Při první zprávě"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Volá se statický rozbor. Počkejte, prosím"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Přímé zadání"
 
@@ -2363,6 +2357,11 @@ msgstr "a všichni nejmenovaní..."
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Vnitřní chyba: Nelze nalézt shodu pro řádek %ld. Uložte, prosím, svou "
+#~ "práci."
+
 #~ msgid "line wrap"
 #~ msgstr "Zalomení řádku"
 
diff --git a/po/da.po b/po/da.po
index c1b441d6d4218c138b13ada998392e6188e6aabf..b5b3dbc7616ef919fddaef784e594d45798f0d6b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2011-11-11 22:53+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -31,8 +31,8 @@ msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Afbrudt"
 
@@ -44,7 +44,7 @@ msgstr "Kan ikke gå uden for %s i begrænset tilstand"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
@@ -66,20 +66,20 @@ msgid "(parent dir)"
 msgstr "(ophavs-kat)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søg"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søgningen genstartet fra begyndelsen"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er det eneste tilfælde"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
@@ -226,12 +226,12 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhedsfil"
@@ -293,8 +293,8 @@ msgstr "For mange sikkerhedskopifiler?"
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
@@ -1695,16 +1695,16 @@ msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompileret %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHjemmeside: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1713,67 +1713,67 @@ msgstr ""
 "\n"
 " Kompileringsflag:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desværre, understøttelse af denne funktion er blevet deaktiveret"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Læser fra stdin, ^C for at afbryde\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at returnere til nano\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukendt kommando"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoreret, mumle mumle"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoreret, mumle mumle"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1815,8 +1815,8 @@ msgstr "Fejl i %s på linje %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
@@ -1871,22 +1871,22 @@ msgstr "Kunne ikke associere navnet \"%s\" med en funktion"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, keystr \"%s\" er en ugyldig binding"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1901,66 +1901,66 @@ msgstr ""
 "\"black\", med den valgfri forstavelse \"bright\"\n"
 "til forgrundsfarver."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Mangler regex-streng"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Baggrundsfarven \"%s\" må ikke være lys"
 
 # Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Mangler magisk strengnavn"
 
 # Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal fejl: Ingen taster bundet til funktionen \"%s\""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1968,63 +1968,63 @@ msgstr ""
 "Afslutter.  Start om nødvendigt nano med flaget -I for at justere dine "
 "nanorc-indstillinger\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Flaget er ikke en gyldig flerbytestreng"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke fjerne flag \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukendt flag \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2039,38 +2039,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ikke fundet"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Versalfølsom]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regudtr]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Bagud]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (at erstatte) i markering"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (at erstatte)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstat denne forekomst?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstat med"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2078,19 +2078,19 @@ msgstr[0] "Erstattede %lu forekomst"
 msgstr[1] "Erstattede %lu forekomster"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Indtast linjenummer, kolonnenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
@@ -2106,9 +2106,9 @@ msgstr "Markering fjernet"
 msgid "Nothing in undo buffer!"
 msgstr "Intet i fortrydelsesbufferen!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Intern fejl: Kan ikke matche linje %d.  Gem venligst dit arbejde"
 
 # De her mystiske "text add" og den slags indgår i strengen "Undid action (%s)" hvor %s er en af disse
@@ -2163,22 +2163,17 @@ msgstr "Intet at omgøre!"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Intern fejl: Kan ikke opsætte uncut.  Gem venligst dit arbejde."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Intern fejl: Kan ikke matche linje %d.  Gem venligst dit arbejde"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
@@ -2204,7 +2199,7 @@ msgstr "Redigér en erstatning"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
@@ -2220,91 +2215,91 @@ msgstr "Fejl ved kald af \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Tilføj ikke linjeskift til slut i filer"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Vis denne meddelelse"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Vis denne meddelelse"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Linjer: %ld  Tegn: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Ordret input"
 
diff --git a/po/de.po b/po/de.po
index 13c89af876212f6be87f23c8b560d61602a6f752..05ed5207d7bd464b2f7bbd39d201e16adee8370a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,13 +5,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.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-11 22:19+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 20:38+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:203
@@ -27,8 +27,8 @@ msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -42,7 +42,7 @@ msgstr ""
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
@@ -64,20 +64,20 @@ msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Suche"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Suche wieder von vorn"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Das ist das einzige Auftreten"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
@@ -116,7 +116,7 @@ msgstr "Fehler beim Lesen der Sperrdatei %s: Nicht genügend Daten gelesen"
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Datei %s wird bearbeitet (von %s mit %s, Prozess-ID %d); fortsetzen?"
 
 #: src/files.c:308
 #, c-format
@@ -226,12 +226,12 @@ msgstr "Neue Datei"
 msgid "\"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
@@ -295,8 +295,8 @@ msgstr "Zu viele Sicherungsdateien?"
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
@@ -761,9 +761,8 @@ msgid "Go to next linter msg"
 msgstr "Zur nächsten Linter-Meldung gehen"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Den Linter aufrufen (wenn verfügbar)"
+msgstr "Den Formatierer aufrufen (wenn verfügbar)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -799,9 +798,8 @@ msgid "To Linter"
 msgstr "Zum Linter"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "DOS-Format"
+msgstr "Formatierer"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1668,15 +1666,15 @@ msgstr "Fließenden Zeilenumbruch aktivieren"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU Nano Version %s (kompiliert um %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU Nano Version %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWWW: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1685,69 +1683,69 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Die Unterstützung für diese Funktion wurde leider deaktiviert"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Kein Dateiname"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 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:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Von Standardeingabe wird gelesen, ^C zum Abbrechen\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Benutzen Sie „fg“, um zu Nano zurückzukehren.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Unbekannter Befehl"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoriert, murmel murmel"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoriert, murmel murmel"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angeforderte Tabulatorbreite „%s“ ist ungültig."
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Angeforderte Füllgröße „%s“ ist ungültig."
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Benutzen Sie „%s -h“ für eine Liste verfügbarer Optionen.\n"
@@ -1789,8 +1787,8 @@ msgstr "Fehler in %s in Zeile %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Zeichenketten für reguläre Ausdrücke müssen mit \" anfangen und enden"
 
@@ -1843,22 +1841,22 @@ msgstr "„%s“ kann nicht auf eine Funktion gebunden werden"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "„%s“ kann nicht auf ein Menü gebunden werden"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktion »%s« existiert im Menü »%s« nicht"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Taste „%s“ kann leider nicht neu zugewiesen werden."
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fehler beim Erweitern von %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1873,73 +1871,71 @@ msgstr ""
 "und „black“ (schwarz), mit dem optionalen Präfix „bright“ (hell)\n"
 "für Vordergrundfarben."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Farbdirektive kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
 "haben."
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Fehlender regulärer Ausdruck"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Regulärer Ausdruck für Header kann nicht hinzugefügt werden, ohne einen "
 "Syntaxbefehl zu haben."
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Magischer regulärer Ausdruck kann nicht hinzugefügt werden, ohne einen "
 "Syntaxbefehl zu haben."
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Fehlender Name für magische Zeichenkette"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr ""
 "Linter kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Fehlender Linter-Name"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
 msgstr ""
-"Linter kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+"Formatierer kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Fehlender Linter-Name"
+msgstr "Formatierer-Befehl fehlt"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Schwerwiegender Fehler: keine Tasten an Funktion „%s“ gebunden. Wird "
 "beendet.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1947,62 +1943,62 @@ msgstr ""
 "Bitte starten Sie nano bei Bedarf mit der Option „-I“, um Ihre nanorc-"
 "Einstellungen anzupassen\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Zu erweiternde Syntax „%s“ konnte nicht gefunden werden."
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Fehlende Option"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Option ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Option „%s“ kann nicht zurückgesetzt werden"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Unbekannte Option „%s“"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Heimatverzeichnis kann nicht gefunden werden! Autsch!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2017,38 +2013,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nicht gefunden"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [GROSS/klein]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [reg. Ausdruck]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Rückwärts]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (zu ersetzen) in Auswahl"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ersetzen durch"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2056,19 +2052,19 @@ msgstr[0] "%lu Ersetzung vorgenommen"
 msgstr[1] "%lu Ersetzungen vorgenommen"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zeilennummer, Spaltennummer eingeben"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Keine Klammer"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
@@ -2084,11 +2080,11 @@ msgstr "Markierung entfernt"
 msgid "Nothing in undo buffer!"
 msgstr "Nichts im Rückgängig-Puffer!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Interner Fehler: Zeile %ld kann nicht gefunden werden. Bitte speichern Sie "
+"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
 "Ihre Arbeit."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2142,24 +2138,17 @@ msgstr ""
 "Interner Fehler: „Wiederholen“ kann nicht aufgesetzt werden. Bitte speichern "
 "Sie Ihre Arbeit."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
-"Ihre Arbeit."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operation wiederholt (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Pipe konnte nicht erstellt werden"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Fork konnte nicht durchgeführt werden"
 
@@ -2186,7 +2175,7 @@ msgstr "Ersetzung editieren"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liste falsch geschriebener Wörter wird erstellt, bitte warten..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Größe des Pipe-Puffers konnte nicht bestimmt werden"
 
@@ -2202,89 +2191,88 @@ msgstr "Fehler beim Aufruf von „sort -f“"
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Rechtschreibprüfung wird aufgerufen, bitte warten"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Kein Linter für diesen Dateitype definiert"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Linter wird aufgerufen, bitte warten"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Keine verarbeitbaren Zeilen vom Befehl erhalten: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Diese Meldung ist für nicht geöffnete Datei %s, in neuem Puffer öffnen?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Bei letzter Meldung"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Bei erster Meldung"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fehler: kein Formatierer definiert"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Abgeschlossen"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Linter wird aufgerufen, bitte warten"
+msgstr "Formatierer wird aufgerufen, bitte warten"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Formatierung abgeschlossen"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Direkte Eingabe"
 
@@ -2349,7 +2337,7 @@ msgstr "The Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "die zahlreichen Ãœbersetzer und das TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2363,5 +2351,7 @@ msgstr "und alle Nichtgenannten …"
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
-#~ msgid "line wrap"
-#~ msgstr "Zeilenumbruch"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Interner Fehler: Zeile %ld kann nicht gefunden werden. Bitte speichern "
+#~ "Sie Ihre Arbeit."
diff --git a/po/eo.po b/po/eo.po
index 937f8029b82d90cb1dcc73bbbd92f4077604ec6d..d99dcb65ac4287a04d4d90a9a8af8686f94111fe 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,16 +1,16 @@
 # Esperanto translations for GNU nano.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# "But punishment settles all scores. There is no nagging afterward."
+# “Haben Sie einen Investor brauchen?”
 #
-# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013, 2014.
+# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-13 17:42+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:03+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -26,8 +26,8 @@ msgid "Go To Directory"
 msgstr "Iri dosierujon"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Rezignita"
 
@@ -39,7 +39,7 @@ msgstr "Ne eblas iri ekstere de %s en limigita reĝimo"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eraro dum legado de %s: %s"
@@ -61,20 +61,20 @@ msgid "(parent dir)"
 msgstr "(patra ujo)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Serĉi"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Serĉado ĉirkaŭiris"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ĉi tiu estas la ununura aperaĵo"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Mankas ankoraŭ serĉendaĵo"
 
@@ -112,7 +112,7 @@ msgstr "Eraro dum legado de rigla dosiero %s: nesufiĉaj datumoj legiĝis"
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Dosiero %s jam redaktiĝas (por %s kun %s, PID %d); ĉu daŭrigi?"
 
 #: src/files.c:308
 #, c-format
@@ -222,12 +222,12 @@ msgstr "Nova dosiero"
 msgid "\"%s\" not found"
 msgstr "\"%s\" ne trovatas"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" estas dosierujo"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" estas aparato"
@@ -287,8 +287,8 @@ msgstr "Ĉu troaj savkopioj?"
 msgid "Error writing %s: %s"
 msgstr "Eraro dum skribado de %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eraro dum skribado de portempa dosiero: %s"
@@ -752,9 +752,8 @@ msgid "Go to next linter msg"
 msgstr "Iri al la sekva mesaĝo de la kontrolilo"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
+msgstr "Ruli aranĝilon (se disponeblas)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -790,9 +789,8 @@ msgid "To Linter"
 msgstr "Trakombi"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "DOS-aranĝo"
+msgstr "Aranĝilo"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1485,7 +1483,7 @@ msgstr "uzi unu plian linion por redakti"
 
 #: src/nano.c:886
 msgid "Log & read location of cursor position"
-msgstr "konservi kaj relegi kursoran pozicion"
+msgstr "konservi kaj restaÅ­ri kursoran pozicion"
 
 #: src/nano.c:889
 msgid "-Q <str>"
@@ -1553,7 +1551,7 @@ msgstr "fliki konfuzon pri «Retropaŝo»/«Forigo»"
 
 #: src/nano.c:915
 msgid "Show this help text"
-msgstr "montri ĉi tiun helptekston"
+msgstr "montri ĉi tiun helptekston kaj fini"
 
 #: src/nano.c:918
 msgid "Automatically indent new lines"
@@ -1645,15 +1643,15 @@ msgstr "ĉirkaŭfluigi longajn liniojn"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versio %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Retpoŝto: <nano@nano-editor.org>    TTT: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1662,67 +1660,67 @@ msgstr ""
 "\n"
 " Kompilaj opcioj:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Subteno de ĉi tiu funkcio malebliĝis"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Vaka dosiernomo"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Ĉu konservi modifitan bufron? (\"N\" DETRUOS ŜANĜOJN) "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Legado el ĉefenigujo; ^C por ĉesigi\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevitas SIGHUP aÅ­ SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Uzu \"fg\" por reveni al 'nano'.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "(enŝaltitas)"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "(malŝaltitas)"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Nekonata komando"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Mmm-mmm, XON ignoratas"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Mmm-mmm, XOFF ignoratas"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Petata tablarĝo \"%s\" ne validas"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Petata faldlarĝo \"%s\" ne validas"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Tajpu '%s -h' por vidi liston de eblaj opcioj.\n"
@@ -1766,8 +1764,8 @@ msgstr "Eraro en %s en linio %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento '%s' havas senparan citilon \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
 
@@ -1819,22 +1817,22 @@ msgstr "Ĉeno '%s' ne estas nomo de funkcio"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ĉeno '%s' ne estas nomo de menuo"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funkcio '%s' ne ekzistas en menuo '%s'"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Ne eblas religi klavĉenon '%s'"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Eraro dum malvolvo de %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1849,124 +1847,122 @@ msgstr ""
 "'magenta' (fuksina), 'yellow' (flava), 'cyan' (cejana), 'black' (nigra) kaj\n"
 "'white' (blanka), kun la ebla prefikso 'bright' (hela) por malfonaj koloroj."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mankas nomo de koloro"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Mankas regulesprima signoĉeno"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" bezonas paran \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Fona koloro \"%s\" ne povas esti hela"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Ne eblas aldoni regulesprimon por magia signoĉeno sen komando 'syntax'"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Mankas nomo de magia signoĉeno"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Mankas programnomo post 'linter'"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
+msgstr "Ne eblas aldoni komandon por 'formatter' sen komando 'syntax'"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Mankas programnomo post 'linter'"
+msgstr "Mankas programnomo post 'formatter'"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Neignorebla eraro: neniu klavo ligita al funkcio \"%s\".  Eliro.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "Se necesas, uzu 'nano -I' por ĝustigi la agordojn en 'nanorc'.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ne troviĝas sintakso '%s' por pliampleksigi"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komando \"%s\" ne permesatas en inkluda dosiero"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintakso \"%s\" ne havas kolorajn komandojn"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komando \"%s\" ne estas komprenata"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Mankas opcio"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcio \"%s\" bezonas argumenton"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Neblankaj signoj bezonatas"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Du unukolumnaj signoj bezonatas"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ne eblas malŝalti opcion \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nekonata opcio \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1981,38 +1977,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ne trovatas"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [usklecdistinge]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [regulesprime]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [malantaÅ­en]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (por anstataŭigi) en markaĵo"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (por anstataÅ­igi)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Anstataŭigi ĉi tiun aperaĵon?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "AnstataÅ­igi per"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2020,19 +2016,19 @@ msgstr[0] "Anstataŭiĝis %lu aperaĵo"
 msgstr[1] "Anstataŭiĝis %lu aperaĵoj"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Enigu linionumeron, kolumnonumeron"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ne validas numero de linio aÅ­ kolumno"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ne estas krampo"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ne ekzistas para krampo"
 
@@ -2048,10 +2044,10 @@ msgstr "Malŝaltitas"
 msgid "Nothing in undo buffer!"
 msgstr "Nenio por malfari!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "**Programeraro**: ne eblas kongrui linion %ld.  Konservu vian laboron."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2075,7 +2071,7 @@ msgstr "teksta algluo"
 
 #: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "linisalto"
+msgstr "linifaldo"
 
 #: src/text.c:528 src/text.c:672
 msgid "text insert"
@@ -2102,22 +2098,17 @@ msgstr "Nenio por refari!"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "**Programeraro**: ne eblas prepari refaron.  Konservu vian laboron."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Refariĝis ago (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Malsukcesis krei dukton"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Malsukcesis krei novan procezon"
 
@@ -2142,7 +2133,7 @@ msgstr "Redakti anstataÅ­igon"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Ne eblas scii grandon de dukta bufro"
 
@@ -2158,47 +2149,47 @@ msgstr "Eraro dum lanĉo de 'sort -f'"
 msgid "Error invoking \"uniq\""
 msgstr "Eraro dum lanĉo de 'uniq'"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Finiĝis literuma kontrolo"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eraro dum lanĉo de '%s'"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
-msgstr "Ekruliĝas literumilo, bonvolu atendi"
+msgstr "Ekruliĝas literumilo; bonvolu atendi..."
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Literuma kontrolo malsukcesis: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Literuma kontrolo malsukcesis: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Ne definiĝis sintaks-kontrolilo por ĉi tiu tipo de dosiero"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
-msgstr "Ekruliĝas sintaks-kontrolilo, bonvolu atendi"
+msgstr "Ekruliĝas sintaks-kontrolilo; bonvolu atendi..."
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Riceviĝis nul analizeblaj linioj de la komando «%s»"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
@@ -2206,45 +2197,44 @@ msgstr ""
 
 # La sekvaj mesaĝoj komencas en traduko per minusklo,
 # ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Ĉi tiu estas la lasta mesaĝo"
 
 # La sekvaj mesaĝoj komencas en traduko per minusklo,
 # ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Ĉi tiu estas la unua mesaĝo"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eraro: neniu 'formatter' definiĝis"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Pretas"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Ekruliĝas sintaks-kontrolilo, bonvolu atendi"
+msgstr "Ekruliĝas aranĝilo; bonvolu atendi..."
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Pretas la aranĝado"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVortoj: %lu  Linioj: %ld  Literoj: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "En markaĵo:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Konforma enigo"
 
@@ -2308,7 +2298,7 @@ msgstr "la “Free Software Foundation”"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "la multaj tradukantoj kaj la TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2322,6 +2312,13 @@ msgstr "kaj iuj ajn kiujn ni forgesis..."
 msgid "Thank you for using nano!"
 msgstr "Dankon pro via uzo de 'nano'!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "**Programeraro**: ne eblas kongrui linion %ld.  Konservu vian laboron."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
+
 #~ msgid "line wrap"
 #~ msgstr "linifaldo"
 
@@ -2352,13 +2349,6 @@ msgstr "Dankon pro via uzo de 'nano'!"
 #~ msgid "Missing flag"
 #~ msgstr "Mankas flago"
 
-#~ msgid "Internal error: unknown type.  Please save your work"
-#~ msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
-
-#~ msgid "Internal error: Redo setup failed.  Please save your work"
-#~ msgstr ""
-#~ "**Programeraro**: refara preparado malsukcesis.  Konservu vian laboron."
-
 #~ msgid "Could not pipe"
 #~ msgstr "Malsukcesis krei dukton"
 
diff --git a/po/es.po b/po/es.po
index 824dd47bc23e3a9103cc966883b4b9ab674c5eab..88dee0e1366f8a9e556f11f89c54c4ce653fc4c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,35 +1,35 @@
 # Mensajes en español para GNU nano.
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Jordi Mallach <jordi@sindominio.net>, 2000, 2001, 2002.
 # Ricardo Cárdenes <ricardo@conysis.com>, 2002, 2003, 2004, 2005.
 # Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>, 2006.
 # Jorge González <aloriel@gmail.com>, 2013.
+# Benno Schulenberg <benno@vertaalt.nl>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.3.2pre4\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2013-05-04 12:45+0200\n"
-"Last-Translator: Jorge González <aloriel@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 09:52+0100\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Lokalize 1.0\n"
 
-# a un. sv
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Ir a un directorio"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -41,12 +41,11 @@ msgstr "No se puede ir fuera de %s en modo restringido"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Error leyendo «%s»: %s"
 
-# No se puede. sv
 #: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "No se puede ascender de directorio"
@@ -64,20 +63,20 @@ msgid "(parent dir)"
 msgstr "(dir padre)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Buscar"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Búsqueda recomenzada"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ésta es la única coincidencia"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "No hay patrón de búsqueda"
 
@@ -88,7 +87,7 @@ msgstr ""
 "getpwuid())"
 
 #: src/files.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 "No se pudo determinar el nombre del equipo para el fichero de bloqueo: %s"
@@ -104,28 +103,28 @@ msgid "Error deleting lock file %s: %s"
 msgstr "Error al eliminar el fichero de bloqueo «%s»: %s"
 
 #: src/files.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Error opening lock file %s: %s"
 msgstr "Error al abrir el fichero de bloqueo «%s»: %s"
 
 #: src/files.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
-"Error al leer el fichero de bloqueo «%s»: no hay suficientes datos para leer"
+"Error al leer el fichero de bloqueo «%s»: se han leído insuficientes datos"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
+"Se está editando el fichero «%s» (usuario %s con %s, PID %d); ¿continuar?"
 
 #: src/files.c:308
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing lock file: Directory '%s' doesn't exist"
-msgstr "Error al escribir el fichero temporal «%s»: %s"
+msgstr "Error al escribir el fichero de bloqueo: directorio «%s» no existe"
 
-# queda raro no usar ni "un" ni "el" antes de fichero. sv
 #: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
@@ -234,12 +233,12 @@ msgid "\"%s\" not found"
 msgstr "No se encontró «%s»"
 
 # Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» es un directorio"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» es un fichero de dispositivo"
@@ -271,7 +270,7 @@ msgstr "Tecla ilegal en modo no-multibúfer"
 #: src/files.c:1622
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
-"Falló al escribir el archivo de respaldo, ¿continuar guardándolo? (responda "
+"Fallo al escribir el fichero de respaldo, ¿continuar guardándolo? (responda "
 "N si no está seguro)"
 
 #: src/files.c:1746
@@ -303,8 +302,8 @@ msgstr "¿Demasiados ficheros de respaldo?"
 msgid "Error writing %s: %s"
 msgstr "Error al escirbir «%s»: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Error al escribir en el fichero temporal: %s"
@@ -328,7 +327,6 @@ msgstr " [Formato Mac]"
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
-# Como antes, me suena raro que antes de Fichero no haya "un" o "el". sv
 #: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Anteponer selección al fichero"
@@ -337,22 +335,18 @@ msgstr "Anteponer selección al fichero"
 msgid "Append Selection to File"
 msgstr "Añadir selección al fichero"
 
-# a el -> al. jm
 #: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Escribir selección al fichero"
 
-# de -> del. sv
 #: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
-# de -> del. sv
 #: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nombre del fichero al que añadir"
 
-# ídem. sv
 #: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
@@ -384,24 +378,24 @@ msgstr ""
 "Pulse Intro para continuar\n"
 
 #: src/files.c:2989
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 "No se puede crear el directorio «%s»: %s\n"
 "Se necesita para guardar/cargar el histórico de búsquedas o la posición del "
-"cursor\n"
+"cursor.\n"
 
 #: src/files.c:2995
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
-"La ruta %s no es un directorio y debe serlo.\n"
-"Nano no podrá cargar o guardar la búsqueda o la posición del cursor en el "
-"histórico.\n"
+"La ruta «%s» no es un directorio y debe serlo.\n"
+"Nano no podrá cargar ni guardar el histórico de búsquedas ni las posiciones "
+"del cursor.\n"
 
 #: src/files.c:3012
 #, c-format
@@ -409,8 +403,9 @@ msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Se detectó un fichero de histórico de compatibilidad de nano (%s) que se \n"
-"intenó mover a la ubicación preferida (%s) pero se encontró un error: %s"
+"Se detectó un antiguo fichero de histórico de nano (%s) que se intentó "
+"mover\n"
+"a la ubicación preferida (%s) pero se encontró un error: %s"
 
 #: src/files.c:3016
 #, c-format
@@ -419,9 +414,9 @@ msgid ""
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
-"Se detectó un fichero histórico de compatibilidad de nano (%s) que se\n"
-"movío a la ubicación preferida (%s)\n"
-"(consulte las P+F de nano acerca de este cambio)"
+"Se detectó un antiguo fichero de histórico de nano (%s) que se movió\n"
+"a la ubicación preferida (%s).\n"
+"(Consulte las P+F de nano acerca de este cambio.)"
 
 #. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:477
@@ -433,19 +428,17 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: src/global.c:479
-#, fuzzy
 msgid "Uncut Text"
 msgstr "Pegar texto"
 
 #: src/global.c:481
-#, fuzzy
 msgid "Unjustify"
 msgstr "Desjustificar"
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
 #: src/global.c:485
 msgid "WhereIs Next"
-msgstr "DóndeEstá sig."
+msgstr "Siguiente"
 
 #. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
 #: src/global.c:492
@@ -470,7 +463,7 @@ msgstr "Línea siguiente"
 
 #: src/global.c:497
 msgid "Read File"
-msgstr "Leer fich."
+msgstr "Leer fichero"
 
 #: src/global.c:499
 msgid "FullJstify"
@@ -515,17 +508,14 @@ msgid "Search for a string or a regular expression"
 msgstr "Buscar una cadena o expresión regular"
 
 #: src/global.c:526
-#, fuzzy
 msgid "Search for a string"
-msgstr "Buscar una cadena o expresión regular"
+msgstr "Buscar una cadena"
 
 #: src/global.c:528
-#, fuzzy
 msgid "Go one screenful up"
-msgstr "Ir a la siguiente pantalla"
+msgstr "Ir a la pantalla anterior"
 
 #: src/global.c:529
-#, fuzzy
 msgid "Go one screenful down"
 msgstr "Ir a la siguiente pantalla"
 
@@ -554,12 +544,10 @@ msgid "Go to line and column number"
 msgstr "Ir a una línea y columna"
 
 #: src/global.c:541
-#, fuzzy
 msgid "Mark text starting from the cursor position"
-msgstr "Marcar texto en la posición actual del cursor"
+msgstr "Marcar texto desde la posición actual del cursor"
 
 #: src/global.c:542
-#, fuzzy
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
@@ -597,7 +585,7 @@ msgstr "Ir hacia adelante una palabra"
 
 #: src/global.c:554
 msgid "Go back one word"
-msgstr "Ir una palabra atrás"
+msgstr "Ir hacia atrás una palabra"
 
 #: src/global.c:556
 msgid "Go to previous line"
@@ -617,19 +605,19 @@ msgstr "Ir al final de la línea actual"
 
 #: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Ir al principio del párrafo, después al del párrafo anterior"
+msgstr "Ir al principio del párrafo; después al del párrafo anterior"
 
 #: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "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:566
 msgid "Go to the first line of the file"
-msgstr "Ir a la primera línea del archivo"
+msgstr "Ir a la primera línea del fichero"
 
 #: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Ir a la última línea del archivo"
+msgstr "Ir a la última línea del fichero"
 
 #: src/global.c:569
 msgid "Go to the matching bracket"
@@ -705,11 +693,11 @@ msgstr "Cambiar el uso de expresiones regulares"
 
 #: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Recupera la cadena previa de búsqueda/reemplazo"
+msgstr "Recuperar la cadena previa de búsqueda/reemplazo"
 
 #: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Recupera la siguiente cadena de búsqueda/reemplazo"
+msgstr "Recuperar la siguiente cadena de búsqueda/reemplazo"
 
 #: src/global.c:617
 msgid "Go to file browser"
@@ -717,32 +705,31 @@ msgstr "Ir al navegador de ficheros"
 
 #: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Conmuta el uso de formato DOS"
+msgstr "Conmutar el uso de formato DOS"
 
 #: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Conmuta el uso de formato Mac"
+msgstr "Conmutar el uso de formato Mac"
 
 #: src/global.c:622
 msgid "Toggle appending"
-msgstr "Conmuta añadir texto"
+msgstr "Conmutar el añadir texto"
 
 #: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Conmuta prefijar texto"
+msgstr "Conmutar el prefijar texto"
 
 #: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Conmuta creación de ficheros de respaldo"
+msgstr "Conmutar la creación de ficheros de respaldo"
 
 #: src/global.c:625
 msgid "Execute external command"
-msgstr "Ejecutar orden externa"
+msgstr "Ejecutar una orden externa"
 
-# Ídem de ídem. Te dejo que revises los que siguen.
 #: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Conmuta el uso de nuevo búfer"
+msgstr "Conmutar el uso de nuevo búfer"
 
 #: src/global.c:631
 msgid "Exit from the file browser"
@@ -758,36 +745,31 @@ msgstr "Ir al último fichero de la lista"
 
 #: src/global.c:634
 msgid "Go to the previous file in the list"
-msgstr "Ir al archivo anterior en la lista"
+msgstr "Ir al fichero anterior en la lista"
 
 #: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Ir al siguiente archivo en la lista"
+msgstr "Ir al siguiente fichero en la lista"
 
-# a un. sv
 #: src/global.c:636
 msgid "Go to directory"
 msgstr "Ir a un directorio"
 
 #: src/global.c:639
-#, fuzzy
 msgid "Invoke the linter, if available"
-msgstr "Invocar el corrector ortográfico (si está disponible)"
+msgstr "Invocar el corrector de sintaxis (si está disponible)"
 
 #: src/global.c:640
-#, fuzzy
 msgid "Go to previous linter msg"
-msgstr "Ir a la línea anterior"
+msgstr "Ir al mensaje anterior del corrector"
 
 #: src/global.c:641
-#, fuzzy
 msgid "Go to next linter msg"
-msgstr "Ir a la siguiente línea"
+msgstr "Ir al siguiente mensaje del corrector"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Invocar el corrector ortográfico (si está disponible)"
+msgstr "Invocar el arreglador (si está disponible)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -799,14 +781,12 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/global.c:678
-#, fuzzy
 msgid "Write Out"
 msgstr "Guardar"
 
-# a un. sv
 #: src/global.c:704
 msgid "Go To Dir"
-msgstr "Ir a un dir"
+msgstr "A un directorio"
 
 #: src/global.c:719
 msgid "Cut Text"
@@ -821,26 +801,24 @@ msgid "To Spell"
 msgstr "Ortografía"
 
 #: src/global.c:738
-#, fuzzy
 msgid "To Linter"
-msgstr "Ir a línea"
+msgstr "Corrector"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Formato DOS"
+msgstr "Arreglador"
 
 #: src/global.c:745
 msgid "Case Sens"
-msgstr "May/min"
+msgstr "Mayús/minús"
 
 #: src/global.c:750
 msgid "Regexp"
-msgstr "ExpReg"
+msgstr "Exp. regular"
 
 #: src/global.c:755
 msgid "Backwards"
-msgstr "Hacia Atrás"
+msgstr "Hacia atrás"
 
 #: src/global.c:762
 msgid "No Replace"
@@ -848,28 +826,27 @@ msgstr "No sustituir"
 
 #: src/global.c:770
 msgid "Cur Pos"
-msgstr "Pos actual"
+msgstr "Posición"
 
 #: src/global.c:780
 msgid "Prev Page"
-msgstr "Pág Ant."
+msgstr "Página ant."
 
 #: src/global.c:782
 msgid "Next Page"
-msgstr "Pág Sig."
+msgstr "Página sig."
 
 #: src/global.c:785
 msgid "First Line"
-msgstr "Prim. lín."
+msgstr "Primera línea"
 
 #: src/global.c:787
 msgid "Last Line"
 msgstr "Última línea"
 
 #: src/global.c:794
-#, fuzzy
 msgid "To Bracket"
-msgstr "No es una llave"
+msgstr "A llave"
 
 #: src/global.c:797
 msgid "Mark Text"
@@ -936,7 +913,6 @@ msgid "Scroll Down"
 msgstr "Despl abajo"
 
 #: src/global.c:858
-#, fuzzy
 msgid "Prev File"
 msgstr "Fichero anterior"
 
@@ -945,7 +921,6 @@ msgid "Next File"
 msgstr "Fichero siguiente"
 
 #: src/global.c:869
-#, fuzzy
 msgid "Verbatim"
 msgstr "Entrada literal"
 
@@ -982,11 +957,11 @@ msgstr "Suspender"
 
 #: src/global.c:910
 msgid "PrevHstory"
-msgstr "HistóricoPrev"
+msgstr "Previo histórico"
 
 #: src/global.c:913
 msgid "NextHstory"
-msgstr "HistSig"
+msgstr "Sig. histórico"
 
 #: src/global.c:917
 msgid "Go To Text"
@@ -1010,7 +985,7 @@ msgstr "Anteponer"
 
 #: src/global.c:939
 msgid "Backup File"
-msgstr "Respaldar fich."
+msgstr "Respaldar fichero"
 
 #: src/global.c:946
 msgid "Execute Command"
@@ -1022,31 +997,29 @@ msgstr "A ficheros"
 
 #: src/global.c:964
 msgid "First File"
-msgstr "Primer fich."
+msgstr "Primer fichero"
 
 #: src/global.c:966
 msgid "Last File"
-msgstr "Último fich."
+msgstr "Último fichero"
 
 #: src/global.c:977
-#, fuzzy
 msgid "Prev Lint Msg"
-msgstr "Línea anterior"
+msgstr "Mensaje anterior"
 
 #: src/global.c:979
-#, fuzzy
 msgid "Next Lint Msg"
-msgstr "Línea siguiente"
+msgstr "Mensaje siguiente"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
 #: src/global.c:1227
 msgid "Help mode"
-msgstr "Modo ayuda"
+msgstr "Modo de ayuda"
 
 #: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Posición del cursor constante"
+msgstr "Muestra constante de la posición del cursor"
 
 #: src/global.c:1231
 msgid "Use of one more line for editing"
@@ -1057,13 +1030,12 @@ msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
 #: src/global.c:1235
-#, fuzzy
 msgid "Soft wrapping of overlong lines"
-msgstr "No wrapear líneas largas"
+msgstr "Suave ajuste de líneas largas"
 
 #: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Mostrar blancos"
+msgstr "Muestra de blancos"
 
 #: src/global.c:1239
 msgid "Color syntax highlighting"
@@ -1071,35 +1043,33 @@ msgstr "Coloreado de sintaxis"
 
 #: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tecla «smart home»"
+msgstr "Sagaz tecla «Home»"
 
 # En español se dice sangrar. Es un término tipográfico que se usa
 # desde hace mucho, pero que la gente olvida por influencia del inglés. sv
 #: src/global.c:1243
 msgid "Auto indent"
-msgstr "Auto sangrar"
+msgstr "Auto-sangrado"
 
-# de la línea. sv
 #: src/global.c:1245
 msgid "Cut to end"
-msgstr "Cortar hasta el final"
+msgstr "Cortado desde el cursor hasta el final de línea"
 
 #: src/global.c:1247
-#, fuzzy
 msgid "Hard wrapping of overlong lines"
-msgstr "No wrapear líneas largas"
+msgstr "Rígido ajuste de líneas largas"
 
 #: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr "Conversión de las pulsaciones de tabulador a espacios"
+msgstr "Conversión de pulsaciones de tabulador a espacios"
 
 #: src/global.c:1251
 msgid "Backup files"
-msgstr "Respaldar ficheros"
+msgstr "Respaldado de ficheros"
 
 #: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Múltiples búfers de ficheros"
+msgstr "Múltiples búferes de fichero"
 
 #: src/global.c:1255
 msgid "Mouse support"
@@ -1415,11 +1385,11 @@ msgstr ""
 
 #: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "activar/desactivar"
+msgstr " activar/desactivar"
 
 #: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal en modo vistualización"
+msgstr "Tecla no es válida en modo de visualización"
 
 #: src/nano.c:713
 #, c-format
@@ -1483,7 +1453,7 @@ msgstr "Comenzar en la línea número LÍNEA, y columna COLUMNA"
 
 #: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Habilitar tecla «smart home»"
+msgstr "Habilitar una sagaz tecla «Home»"
 
 #: src/nano.c:850
 msgid "Save backups of existing files"
@@ -1497,9 +1467,10 @@ msgstr "-C <dir>"
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
+# The "unique" is unnecessary and confusing.  --  benno
 #: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Directorio donde guardar ficheros de respaldo únicos"
+msgstr "Directorio donde guardar ficheros de respaldo"
 
 #: src/nano.c:855
 msgid "Use bold instead of reverse video text"
@@ -1511,11 +1482,11 @@ msgstr "Convertir tabulaciones a espacios al escribir"
 
 #: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Habilitar múltiples búfer de ficheros"
+msgstr "Habilitar múltiples búferes de fichero"
 
 #: src/nano.c:865
 msgid "Use (vim-style) lock files"
-msgstr "Usar archivos de bloqueo (estilo vim)"
+msgstr "Usar ficheros de bloqueo (estilo vim)"
 
 #: src/nano.c:869
 msgid "Log & read search/replace string history"
@@ -1541,17 +1512,18 @@ msgstr "No convertir los ficheros desde el formato DOS/Mac"
 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:886
 msgid "Log & read location of cursor position"
-msgstr "Guardar y leer la ubicación de la posición del cursor"
+msgstr "Guardar y restaurar la posición del cursor"
 
 #: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q <cad>"
+msgstr "-Q <cadena>"
 
 #: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<cad>"
+msgstr "--quotestr=<cadena>"
 
 #: src/nano.c:890
 msgid "Quoting string"
@@ -1567,15 +1539,15 @@ msgstr "Desplazarse línea a línea en lugar de media pantalla"
 
 #: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <núm>"
+msgstr "-T <número>"
 
 #: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<núm>"
+msgstr "--tabsize=<número>"
 
 #: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Fijar el ancho de tab a núm columnas"
+msgstr "Fijar el ancho de tab a <número> columnas"
 
 #: src/nano.c:900
 msgid "Do quick statusbar blanking"
@@ -1583,7 +1555,7 @@ msgstr "Borrado rápido de la barra de estado"
 
 #: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Imprimir información sobre la versión y salir"
+msgstr "Mostrar información sobre la versión y salir"
 
 #: src/nano.c:906
 msgid "Detect word boundaries more accurately"
@@ -1591,7 +1563,7 @@ msgstr "Detectar límite entre palabras más detalladamente"
 
 #: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y <cad>"
+msgstr "-Y <cadena>"
 
 #: src/nano.c:909
 msgid "--syntax=<str>"
@@ -1610,13 +1582,12 @@ msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arreglar el problema de confusión Retroceso/Suprimir"
 
 #: src/nano.c:915
-#, fuzzy
 msgid "Show this help text"
-msgstr "Mostrar esta ayuda"
+msgstr "Mostrar este texto de ayuda y salir"
 
 #: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indentar automáticamente nuevas líneas"
+msgstr "Sangrar automáticamente nuevas líneas"
 
 #: src/nano.c:919
 msgid "Cut from cursor to end of line"
@@ -1632,7 +1603,7 @@ msgstr "Habilitar el uso del ratón"
 
 #: src/nano.c:926
 msgid "Do not read the file (only write it)"
-msgstr ""
+msgstr "No leer el fichero (sólo escribirlo)"
 
 #: src/nano.c:928
 msgid "-o <dir>"
@@ -1652,45 +1623,43 @@ msgstr "Conservar teclas XON (^Q) y XOFF (^S)"
 
 #: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr "Ignorar silenciosamente problemas de inicio como errores rc de fichero"
+msgstr "Ignorar silenciosamente problemillas de inicio"
 
 #: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <núm>"
+msgstr "-r <número>"
 
 #: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<núm>"
+msgstr "--fill=<número>"
 
 #: src/nano.c:939
-#, fuzzy
 msgid "Set hard-wrapping point at column #cols"
-msgstr "Fijar el límite de ajuste de líneas en núm columnas"
+msgstr "Fijar el límite de ajuste en <número> columnas"
 
 #: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s <prog>"
+msgstr "-s <programa>"
 
 #: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<prog>"
+msgstr "--speller=<programa>"
 
 #: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Habilitar corrector alternativo"
+msgstr "Habilitar un corrector ortográfico alternativo"
 
 #: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Guardar automáticamente al salir, no preguntar"
+msgstr "Guardar automáticamente al salir, sin preguntar"
 
 #: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Modo visualización (sólo lectura)"
+msgstr "Modo de visualización (sólo lectura)"
 
 #: src/nano.c:949
-#, fuzzy
 msgid "Don't hard-wrap long lines"
-msgstr "No wrapear líneas largas"
+msgstr "No rígidamente ajustar líneas largas"
 
 #: src/nano.c:951
 msgid "Don't show the two help lines"
@@ -1705,19 +1674,19 @@ msgstr "Habilitar suspensión"
 # sitios y nadie encontró nada convincente. jm
 #: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Activar ajuste de línea suave"
+msgstr "Habilitar ajuste de línea suave"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versión %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1726,70 +1695,71 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Lo siento, se ha deshabilitado el soporte de esta función"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
-msgstr ""
+msgstr "Sin nombre de fichero"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS)?"
+msgstr ""
+"¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Leyendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Use «fg» para volver a nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Orden desconocida"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Se ignora XON, mmh mmh"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Se ignora XOFF, mmh mmh"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "El tamaño de tabulador «%s» no es válido"
+msgstr "El tamaño «%s» de tabulador no es válido"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "El tamaño de llenado «%s» no es válido"
+msgstr "El tamaño «%s» de llenado no es válido"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr ""
+msgstr "Teclea «%s -h» para una lista de opciones.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
@@ -1804,7 +1774,7 @@ msgstr "Nn"
 
 #: src/prompt.c:1057
 msgid "Aa"
-msgstr "Tt"
+msgstr "TtAa"
 
 #: src/prompt.c:1071
 msgid "Yes"
@@ -1828,12 +1798,11 @@ msgstr "Error en %s en la línea %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
 
-# c-format
 #: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
@@ -1841,7 +1810,7 @@ msgstr "Regex «%s» incorrecta: %s"
 
 #: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Nombre de la sintaxis inexistente"
+msgstr "Falta el nombre para la sintaxis"
 
 #: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
@@ -1857,49 +1826,48 @@ msgstr "Falta el nombre de la combinación"
 
 #: src/rcfile.c:442 src/rcfile.c:453
 msgid "Key name is too short"
-msgstr ""
+msgstr "El nombre de la combinación está demasiado corta"
 
 #: src/rcfile.c:463
-#, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr "las combinaciones de teclas deben comenzar por «^», «M» o «F»"
+msgstr "El nombre de una combinación debe comenzar por «^», «M» o «F»"
 
 #: src/rcfile.c:472
-#, fuzzy
 msgid "Must specify a function to bind the key to"
-msgstr "Debe especificar una función a la que vincular la tecla"
+msgstr "Debe especificar una función a la cual vincular la tecla"
 
 #. TRANSLATORS: Do not translate the word "all".
 #: src/rcfile.c:482
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Debe especificar un menú (o «all») en la cual vincular/desvincular la tecla"
 
 #: src/rcfile.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr "No se pudo mapear el nombre «%s» a una función"
+msgstr "El «%s» no es un nombre de función"
 
 #: src/rcfile.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr "No se pudo mapear el nombre «%s» a un menú"
+msgstr "El «%s» no es un nombre de menú"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr ""
+msgstr "La función «%s» no existe en menú «%s»"
 
-#: src/rcfile.c:539
-#, fuzzy, c-format
+#: src/rcfile.c:543
+#, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "La combinación «%s» es ilegal"
+msgstr "La combinación «%s» no puede ser revinculado"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:629
+#, c-format
 msgid "Error expanding %s: %s"
-msgstr "Error leyendo «%s»: %s"
+msgstr "Error al expandir «%s»: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1914,131 +1882,128 @@ msgstr ""
 "«black», con el prefijo opcional «bright»\n"
 "para los de primer plano."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Nombre del color inexistente"
+msgstr "Falta un nombre de color"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta la cadena regex"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requiere su «end=» correspondiente"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "El color de fondo «%s» no puede ser brillante"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "No se puede añadir una cabecera de expreg sin un comando de sintaxis"
+msgstr ""
+"No se puede añadir una expresión regular para «header» sin un comando "
+"«syntax»"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
-"No se puede añadir una cadena mágica de expreg sin un comando de sintaxis"
+"No se puede añadir una expresión regular para «magic» sin un comando «syntax»"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Falta el nombre de la cadena mágica"
 
-#: src/rcfile.c:981
-#, fuzzy
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
-msgstr "No se puede añadir una cabecera de expreg sin un comando de sintaxis"
+msgstr "No se puede añadir un «linter» sin un comando «syntax»"
 
-#: src/rcfile.c:986
-#, fuzzy
+#: src/rcfile.c:990
 msgid "Missing linter command"
-msgstr "Nombre del color inexistente"
+msgstr "Falta un nombre de programa detrás «linter»"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+msgstr "No se puede añadir un «formatter» sin un comando «syntax»"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr ""
+msgstr "Falta un nombre de programa detrás «formatter»"
 
-#: src/rcfile.c:1041
-#, fuzzy, c-format
+#: src/rcfile.c:1045
+#, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
-msgstr "Error fatal: no existen teclas mapeadas para la función «%s»"
+msgstr ""
+"Error fatal: no hay teclas vinculadas a la función «%s».  Terminando.\n"
 
-#: src/rcfile.c:1043
-#, fuzzy, c-format
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saliendo. Por favor, si es necesario use nano con la opción -I para ajustar "
-"su configuración nanorc.\n"
+"Si es necesario, use nano con la opción -I para ajustar su configuración "
+"nanorc.\n"
 
-#: src/rcfile.c:1104
-#, fuzzy, c-format
+#: src/rcfile.c:1108
+#, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "No se pudo mapear el nombre «%s» a un menú"
+msgstr "No se pudo encontrar el sintaxis «%s» para extender"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "No se admite la orden «%s» en el fichero incluido"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxis «%s» no tiene órdenes de color"
 
-# en la línea. sv
-# el comando -> la orden.
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:1182
-#, fuzzy
+#: src/rcfile.c:1186
 msgid "Missing option"
-msgstr "Nombre del color inexistente"
+msgstr "Falta una opción"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "La opción «%s» precisa un argumento"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "La opción no es una cadena multibyte válida"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Se requieren caracteres que no sean blancos"
+msgstr "Se precisan caracteres que no sean blancos"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1335
-#, fuzzy, c-format
+#: src/rcfile.c:1339
+#, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "No se pudo desactivar la opción «%s»"
+msgstr "No es posible desactivar la opción «%s»"
 
-#: src/rcfile.c:1341
-#, fuzzy, c-format
+#: src/rcfile.c:1345
+#, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opción «%s» desconocida"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "No se encontró el directorio del usuario."
+msgstr "No se encontró el directorio del usuario.  Ay!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2053,58 +2018,58 @@ msgid "\"%.*s%s\" not found"
 msgstr "No se encontró «%.*s%s»"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Mayúsc/minúsc]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Hacia atrás]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (a reemplazar) en la selección"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "¿Reemplazar esta instancia?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Ocurrencia %lu reemplazada"
+msgstr[0] "%lu ocurrencia reemplazada"
 msgstr[1] "%lu ocurrencias reemplazadas"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduce número de línea, número de columna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Número de línea o columna no válido"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No es una llave"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hay una llave correspondiente"
 
@@ -2120,30 +2085,30 @@ msgstr "Marca borrada"
 msgid "Nothing in undo buffer!"
 msgstr "Nada para deshacer en el búfer"
 
-#: src/text.c:445
-#, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "Error interno: no se puede encontrar la línea %d. Guarde su trabajo."
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Error interno: no se puede encontrar la línea %d.  Guarde su trabajo."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr "añadir texto"
+msgstr "añadido de texto"
 
 #: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "eliminar texto"
+msgstr "eliminado de texto"
 
 #: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr "combinar línea"
+msgstr "juntado de líneas"
 
 #: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr "cortar texto"
+msgstr "cortado de texto"
 
 #: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr "pegar texto"
+msgstr "pegado de texto"
 
 #: src/text.c:515 src/text.c:623
 msgid "line break"
@@ -2151,15 +2116,15 @@ msgstr "salto de línea"
 
 #: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "insertar texto"
+msgstr "inserción de texto"
 
 #: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr "reemplazar texto"
+msgstr "reemplazo de texto"
 
 #: src/text.c:556 src/text.c:679 src/text.c:983
 msgid "Internal error: unknown type.  Please save your work."
-msgstr "Error interno: tipo desconocido. Guarde su trabajo."
+msgstr "Error interno: tipo desconocido.  Guarde su trabajo."
 
 #: src/text.c:561
 #, c-format
@@ -2171,42 +2136,32 @@ msgid "Nothing to re-do!"
 msgstr "Nada para rehacer"
 
 #: src/text.c:584
-#, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
-msgstr "Error interno: no se puede configurar pegar. Guarde su trabajo."
-
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Error interno: no se puede encontrar la línea %d. Guarde su trabajo."
+msgstr "Error interno: no se puede configurar un rehacer.  Guarde su trabajo."
 
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Acción rehecha (%s)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "No se pudo crear una tubería («pipe»)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
 #: src/text.c:969
-#, fuzzy
 msgid "Internal error: cannot set up uncut.  Please save your work."
-msgstr "Error interno: no se puede configurar pegar. Guarde su trabajo."
+msgstr "Error interno: no se puede configurar un pegar.  Guarde su trabajo."
 
 #: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita «%s» no es válido: %s"
 
-# ahora se puede. sv
 #: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Ahora se puede desjustificar."
@@ -2217,10 +2172,9 @@ msgstr "Editar un reemplazo"
 
 #: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creando lista de palabras mal escritas. Ppor favor, espere..."
+msgstr "Creando una lista de palabras mal escritas.  Espere, por favor..."
 
-# Ídem de ídem. Te dejo que revises los que siguen.
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "No se pudo obtener el tamaño del búfer de la tubería («pipe»)"
 
@@ -2236,98 +2190,94 @@ msgstr "Error al invocar «sort -f»"
 msgid "Error invoking \"uniq\""
 msgstr "Error al invocar «uniq»"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Error al invocar «%s»"
 
-#: src/text.c:2889
-#, fuzzy
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
-msgstr "Invocar el corrector ortográfico (si está disponible)"
+msgstr "Invocando el corrector ortográfico.  Espere, por favor..."
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Comprobación de ortografía fallida: «%s»"
+msgstr "Comprobación de ortografía fallida: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Comprobación de ortografía fallida: %s: %s"
 
-#: src/text.c:2941
-#, fuzzy
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
-msgstr "No añadir avances de línea al final de los ficheros"
+msgstr "No se ha definido un corrector de sintaxis para este tipo de fichero"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
-msgstr ""
+msgstr "¿Guardar el búfer modificado antes de invocar el corrector?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
-msgstr ""
+msgstr "Invocando el corrector de sintaxis.  Espere, por favor..."
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr ""
+msgstr "Se ha recibido cero líneas analizables del comando «%s»"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
-msgstr ""
+msgstr "Este mensaje es para fichero %s; ¿abrirlo en un nuevo búfer?"
 
-#: src/text.c:3209
-#, fuzzy
+#: src/text.c:3205
 msgid "At last message"
-msgstr "Mostrar este mensaje"
+msgstr "Este es el último mensaje"
 
-#: src/text.c:3214
-#, fuzzy
+#: src/text.c:3210
 msgid "At first message"
-msgstr "Mostrar este mensaje"
+msgstr "Este es el primer mensaje"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no se ha definido un «formatter»"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Acabado"
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr ""
+msgstr "Invocando el arreglador.  Espere, por favor..."
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Se acabó el arreglado"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalabras: %lu Líneas: %ld Caracteres: %lu "
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "En la selección: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
 # ¡memoria insuficiente! sv
 #: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano se ha quedado sin memoria."
+msgstr "nano se ha quedado sin memoria"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
@@ -2386,7 +2336,7 @@ msgstr "La Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "los traductores y la TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2400,6 +2350,10 @@ msgstr "y cualquiera del que nos hayamos olvidado..."
 msgid "Thank you for using nano!"
 msgstr "Gracias por usar nano."
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error interno: no se puede encontrar la línea %ld.  Guarde su trabajo."
+
 #~ msgid "Insert File"
 #~ msgstr "Insertar fichero"
 
@@ -2433,12 +2387,6 @@ msgstr "Gracias por usar nano."
 #~ msgid "Missing flag"
 #~ msgstr "Falta la opció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
-#~ msgid "line wrap"
-#~ msgstr "ajuste de líneas"
-
 #~ msgid "Internal error: unknown type.  Please save your work"
 #~ msgstr "Error interno: tipo desconocido. Guarde su trabajo."
 
@@ -2446,10 +2394,6 @@ msgstr "Gracias por usar nano."
 #~ msgstr ""
 #~ "Error interno: falló la configuración de rehacer. Guarde su trabajo."
 
-# Lo mismo. No se pudo cerrar. sv
-#~ msgid "Could not pipe"
-#~ msgstr "No se pudo canalizar"
-
 #~ msgid "Space"
 #~ msgstr "Espacio"
 
diff --git a/po/eu.po b/po/eu.po
index e368e573d23408798343d23f1c8a9d3db09cb6a6..0ccbb815697b6b55107e6df53c1328a4ddb2be95 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2006-09-25 19:59+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
@@ -37,7 +37,7 @@ msgstr "Ezin da %stik kanpora joan era murriztuan"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr "(aita dir.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hau da kointzidentzia bakarra"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
@@ -211,12 +211,12 @@ msgstr "Fitxategi berria"
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
@@ -278,8 +278,8 @@ msgstr "Babes-kopia fitxategi gehiegi?"
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
@@ -1674,16 +1674,16 @@ msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "E-posta: nano@nano-editor.org\tWebgunea: http://www.nano-editor.org"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1692,68 +1692,68 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Barkatu, funtzio horrentzat euskarria gaitu gabe dago"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Komando ezezaguna"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoratua, kaka zarra"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoratua, kaka zarra"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1795,8 +1795,8 @@ msgstr "Errorea %s-n %lu lerroan: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
@@ -1849,22 +1849,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1880,129 +1880,129 @@ msgstr ""
 "\"black\", \"bright\" aukerazko aurrizkiarekin\n"
 "aurreplanoko koloreentzat."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ezin izan zen %s ireki %s idazteko"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ezin da \"%s\" bandera kendu"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "\"%s\" bandera ezezaguna"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2017,38 +2017,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ez da aurkitu"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr "[May/Min]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr "[Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr "[Atzeruntza]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (aldatzeko) aukeraketan"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2056,20 +2056,20 @@ msgstr[0] "%lu kointzidentzia aldatuta"
 msgstr[1] "%lu kointzidentzia aldatuta"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
@@ -2085,9 +2085,9 @@ msgstr "Markatu ez hautatua"
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2142,22 +2142,17 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
@@ -2182,7 +2177,7 @@ msgstr "Ordezkoa editatu"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
@@ -2198,91 +2193,91 @@ msgstr "Errorea \"sort -f\"-i deitzen"
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Mezu hau erakutsi"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Sarrera literala"
 
diff --git a/po/fi.po b/po/fi.po
index ae5abffac4c1f48f82022f347b84826d783fc9cd..b0688d6c769b33dc1c61a8a5206875f49e91322b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,17 +1,17 @@
 # GNU nano Finnish Translation.
-# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Pauli Virtanen <pauli.virtanen@saunalahti.fi>, 2000, 2001.
 # Kalle Kivimaa <kalle.kivimaa@iki.fi>, 2003.
 # Kalle Olavi Niemitalo <kon@iki.fi>, 2003.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2014.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-17 20:39+0300\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-07 21:10+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -26,27 +26,27 @@ msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Peruttu"
 
 #: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Ei voi siirtyä pois hakemistosta %s rajoitetussa tilassa"
+msgstr "Hakemistosta %s pois siirtyminen rajoitetussa tilassa epäonnistui"
 
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa kohdetta %s: %s"
 
 #: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Ei voi siirtyä ylähakemistoon"
+msgstr "Ylähakemistoon siirtyminen epäonnistui"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
@@ -61,20 +61,20 @@ msgid "(parent dir)"
 msgstr "(ylähakem.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Etsi"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Tämä on ainoa esiintymä"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ei nykyistä etsintämallia"
 
@@ -114,6 +114,8 @@ msgstr "Virhe luettaessa lukitustiedostoa %s: Dataa ei luettu riittävästi"
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
+"Tiedostoa %s on muokattu (muokkaaja %s kohteella %s, PID-tunniste %d), "
+"jatketaanko?"
 
 #: src/files.c:308
 #, c-format
@@ -123,7 +125,7 @@ msgstr "Virhe kirjoitettaessa lukitustiedostoa: Hakemistoa ’%s’ ei ole"
 #: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta"
+msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui"
 
 #: src/files.c:467
 msgid "No more open file buffers"
@@ -221,12 +223,12 @@ msgstr "Uusi tiedosto"
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: ”%s”"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "”%s” on hakemisto"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "”%s” on laitetiedosto"
@@ -241,7 +243,7 @@ msgstr "Uudessa puskurissa suoritettava komento [kohteesta %s] "
 msgid "Command to execute [from %s] "
 msgstr "Suoritettava komento [kohteesta %s] "
 
-#  Toisaalla on "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta",
+#  Toisaalla on "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui",
 #  joten täälläkin on "hakemistosta" eikä "hakemistossa".
 #: src/files.c:1069
 #, c-format
@@ -268,7 +270,7 @@ msgstr ""
 #: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Ei voi kirjoittaa hakemiston %s ulkopuolelle"
+msgstr "Hakemiston %s ulkopuolelle kirjoittaminen epäonnistui"
 
 #  "Prepend" ei ole englanti, oikea sana on "prefix"
 #  "Prepend" is not an English word, use "prefix"
@@ -296,8 +298,8 @@ msgstr "Liian monta varmuuskopiotiedostoa?"
 msgid "Error writing %s: %s"
 msgstr "Virhe kirjoitettaessa %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Virhe kirjoitettaessa tilapäiseen tiedostoon: %s"
@@ -771,9 +773,8 @@ msgid "Go to next linter msg"
 msgstr "Siirry seuraavaan esikatseluun"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Käynnistä esikatselu (jos saatavilla)"
+msgstr "Käynnistä muotoilija (jos saatavilla)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -812,9 +813,8 @@ msgid "To Linter"
 msgstr "Esikatseluun"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "DOS-muoto"
+msgstr "Muotoilija"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1689,16 +1689,16 @@ msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU Nano, versio %s (käännetty %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Sähköposti: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1707,69 +1707,69 @@ msgstr ""
 "\n"
 " Mukaan käännetyt valitsimet:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tämä ominaisuus ei ikävä kyllä ole käytössä"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Ei tiedostonimeä"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat ”ei”) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Vakiosyötteen avaaminen uudelleen näppäimistöstä epäonnistui\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Luetaan vakiosyötteestä, ^C lopettaa toiminnon\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa Nanoon komennolla ”fg”.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Tuntematon komento"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON:ia ei käytetä, mutinaa"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF:ia ei käytetä, mutinaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Haluttu sarkaimen koko ”%s” ei kelpaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Haluttu täydennyspituus ”%s” ei kelpaa"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Hae käytettävissä olevat valitsimet kirjoittamalla ’%s -h’.\n"
@@ -1811,8 +1811,8 @@ msgstr "Virhe tiedostossa %s rivillä %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "parametri ’%s’ sisältää parittoman ”-merkin"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Säännöllisten lausekkeiden on alettava ja loputtava ”-merkillä"
 
@@ -1866,22 +1866,22 @@ msgstr "Nimen ”%s” kartoittaminen funktioon epäonnistui"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nimen ”%s” kartoittaminen valikkoon epäonnistui"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktiota ’%s’ ei ole valikossa ’%s’"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Valitettavasti näppäinmerkkijonossa ”%s” on väärä sidonta"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Virhe laajennettaessa kohdetta %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1896,65 +1896,63 @@ msgstr ""
 "”black”, ja alussa voi olla ”bright”\n"
 "edustaväreinä."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "En voi lisätä värikomentoa ilman syntaksikomentoa"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Puuttuva säännöllinen lausekemerkkijono"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "”start=” vaatii vastaavan ”end=”:n"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Taustaväri ”%s” ei voi olla ”bright”"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Ei voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+msgstr "En voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
-"Ei voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
+"En voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
-msgstr "Ei voi lisätä esikatselua ilman syntaksikomentoa"
+msgstr "En voi lisätä esikatselua ilman syntaksikomentoa"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Puuttuva esikatselukomento"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Ei voi lisätä esikatselua ilman syntaksikomentoa"
+msgstr "En voi lisätä muotoilijaa ilman syntaksikomentoa"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Puuttuva esikatselukomento"
+msgstr "Puuttuva muotoilijakomento"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Vakava virhe: funktioon ”%s” ei ole kartoitettu näppäimiä. Poistutaan.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1962,62 +1960,62 @@ msgstr ""
 "Tarvittaessa käytä Nano-ohjelmaa ”-I”-valitsimella, jos nanorc-asetuksia "
 "täytyy säätää.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Laajennettavan syntaksin ”%s” löytäminen epäonnistui"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komentoa ”%s” ei sallita sisällytetyssä tiedostossa"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa ”%s” ei ole värikomentoja"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa ”%s” ei ymmärretty"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valitsin ”%s” vaatii argumentin"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Valitsin ei ole monitavuinen merkkijono"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Kaksi yksisarakkeista merkkiä vaadittu"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "Ei voi poistaa valitsinta ”%s”"
+msgstr "En voi poistaa valitsinta ”%s”"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Tuntematon valitsin ”%s”"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kotihakemistoa ei löydy! Vää!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2032,39 +2030,39 @@ msgid "\"%.*s%s\" not found"
 msgstr "”%.*s%s” ei löytynyt"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Kirj. koko]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Säännöke]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Taaksepäin]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (korvattava) valinnassa"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (korvattava)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
 # Pitäisiköhän olla passiivi?
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2072,20 +2070,20 @@ msgstr[0] "Korvattu %lu kohta"
 msgstr[1] "Korvattu %lu kohtaa"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kirjoita rivin numero, sarakkeen numero"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ei ole suljemerkki"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
@@ -2101,10 +2099,10 @@ msgstr "Merkintä loppui"
 msgid "Nothing in undo buffer!"
 msgstr "Peruutuspuskurissa ei ole mitään!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "Sisäinen virhe: vastaavaa riviä %ld ei löydy. Tallenna työsi."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2155,22 +2153,17 @@ msgstr "Ei mitään tehtävää!"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Sisäinen virhe: komennon redo asettaminen epäonnistui. Tallenna työsi."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Toiminto tehtiin uudelleen (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Lapsiprosessi epäonnistui"
 
@@ -2196,7 +2189,7 @@ msgstr "Muokkaa korvausta"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Luodaan väärin kirjoitettujen sanojen lista, ole hyvä ja odota..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
@@ -2212,90 +2205,90 @@ msgstr "Virhe komennon ”sort -f” aikana"
 msgid "Error invoking \"uniq\""
 msgstr "Virhe komennon ”uniq” aikana"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta ”%s”"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Käynnistä oikoluin, odota hetki"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Kutsutaan esikastelua, odota vähän"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Saatiin 0 jäsenneltäviltä riveiltä komennosta: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Tämä viesti on avamaattomalle tiedostolle %s, avataanko se uudessa "
 "puskurissa?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Viimeisessä viestissä"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Ensimmäisessä viestissä"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Virhe: esikatselua ei ole määritelty"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Valmis"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Kutsutaan esikastelua, odota vähän"
+msgstr "Kutsutaan muotoilijaa, odota vähän"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Lopetettiin muotoilu"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSanoja: %lu  riviä: %ld  merkkiä: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Valinnassa:    "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Merkintarkka syöte"
 
@@ -2360,7 +2353,7 @@ msgstr "Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "monta kielenkääntäjää ja Translationproject"
 
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
 #: src/winio.c:3513
@@ -2375,6 +2368,9 @@ msgstr "ja kaikille muille, jotka unohdimme..."
 msgid "Thank you for using nano!"
 msgstr "Kiitos Nanon käyttämisestä!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Sisäinen virhe: vastaavaa riviä %ld ei löydy. Tallenna työsi."
+
 #~ msgid "line wrap"
 #~ msgstr "rivittäminen"
 
diff --git a/po/fr.po b/po/fr.po
index b426e914fa6359ba66d22302ed7a5be53d453e90..f6671f265c544e894349bc91c250058d1d357bae 100644
--- 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-2014.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-12 20:33+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 00:43+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -50,8 +50,8 @@ msgstr "Changer de répertoire"
 # File: src/search.c, line: 934
 # File: src/search.c, line: 995
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -97,7 +97,7 @@ msgstr "En mode restreint, sortir de %s est impossible"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -132,7 +132,7 @@ msgstr "(remonter)"
 # File: src/browser.c, line: 651
 # File: src/search.c, line: 179
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Recherche"
 
@@ -143,7 +143,7 @@ msgstr "Recherche"
 # File: src/browser.c, line: 760
 # File: src/browser.c, line: 768
 # File: src/search.c, line: 369
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "La recherche a fait le tour"
 
@@ -160,8 +160,8 @@ msgstr "La recherche a fait le tour"
 # File: src/search.c, line: 489
 # File: src/search.c, line: 546
 # File: src/search.c, line: 549
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
 
@@ -170,7 +170,7 @@ msgstr "C'est la seule occurrence"
 # File: src/search.c, line: 555
 # File: src/browser.c, line: 891
 # File: src/search.c, line: 555
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
@@ -228,7 +228,7 @@ msgstr "Erreur de lecture du fichier verrou %s : pas assez de données lues"
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Le fichier %s est ouvert (par %s avec %s, PID %d) ; continuer ?"
 
 #
 # File: src/files.c, line: 1476
@@ -398,7 +398,7 @@ msgstr "« %s » non trouvé"
 # File: src/rcfile.c, line: 375
 # File: src/rcfile.c, line: 870
 # File: src/rcfile.c, line: 904
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -412,7 +412,7 @@ msgstr "« %s » est un répertoire"
 # File: src/rcfile.c, line: 376
 # File: src/rcfile.c, line: 871
 # File: src/rcfile.c, line: 905
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -541,8 +541,8 @@ msgstr "Erreur lors de l'écriture de %s : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
@@ -1286,7 +1286,7 @@ msgstr "Changer de répertoire"
 # File: src/global.c, line: 339
 #: src/global.c:639
 msgid "Invoke the linter, if available"
-msgstr "Appeler l'analyse statique (si dispo.)"
+msgstr "Appeler l'analyseur statique (si dispo.)"
 
 #
 # File: src/global.c, line: 357
@@ -1306,9 +1306,8 @@ msgstr "Aller au message suivant de l'analyse statique"
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Appeler l'analyse statique (si dispo.)"
+msgstr "Appeler l'outil de mise en forme (si dispo.)"
 
 #
 # Les messages suivants doivent tenir sur 10 caractères !
@@ -1375,9 +1374,8 @@ msgstr "Analyse statique"
 # File: src/global.c, line: 958
 # File: src/global.c, line: 958
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Format DOS"
+msgstr "Formateur"
 
 #
 # File: src/global.c, line: 290
@@ -2696,13 +2694,13 @@ msgstr "Affichage multiligne automatique"
 # File: src/nano.c, line: 841
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " nano GNU version %s (compilé à %s, le %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " nano GNU version %s\n"
 
 #
 # File: src/nano.c, line: 844
 # File: src/nano.c, line: 844
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
@@ -2710,7 +2708,7 @@ msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
 #
 # File: src/nano.c, line: 845
 # File: src/nano.c, line: 845
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -2722,26 +2720,26 @@ msgstr ""
 #
 # File: src/nano.c, line: 923
 # File: src/nano.c, line: 923
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Désolé, le support de cette fonction a été désactivé"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Pas de nom de fichier"
 
 #
 # File: src/nano.c, line: 940
 # File: src/nano.c, line: 940
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossible de rouvrir l'entrée standard depuis le clavier, désolé\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
@@ -2749,14 +2747,14 @@ msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
 #
 # File: src/nano.c, line: 1003
 # File: src/nano.c, line: 1003
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Réception de SIGHUP ou SIGTERM\n"
 
 #
 # File: src/nano.c, line: 1020
 # File: src/nano.c, line: 1020
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
@@ -2764,14 +2762,14 @@ msgstr "Utilisez « fg » pour revenir à nano.\n"
 #
 # File: src/nano.c, line: 1186
 # File: src/nano.c, line: 1186
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "- marche"
 
 #
 # File: src/nano.c, line: 1187
 # File: src/nano.c, line: 1187
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "- arrêt"
 
@@ -2780,21 +2778,21 @@ msgstr "- arrêt"
 # File: src/winio.c, line: 530
 # File: src/nano.c, line: 1361
 # File: src/winio.c, line: 530
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Commande inconnue"
 
 #
 # File: src/nano.c, line: 1425
 # File: src/nano.c, line: 1425
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoré, humm humm"
 
 #
 # File: src/nano.c, line: 1428
 # File: src/nano.c, line: 1428
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoré, humm humm"
 
@@ -2803,7 +2801,7 @@ msgstr "XOFF ignoré, humm humm"
 # File: src/rcfile.c, line: 814
 # File: src/nano.c, line: 1827
 # File: src/rcfile.c, line: 814
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "taille de tabulation « %s » demandée non valide"
@@ -2813,12 +2811,12 @@ msgstr "taille de tabulation « %s » demandée non valide"
 # File: src/rcfile.c, line: 739
 # File: src/nano.c, line: 1883
 # File: src/rcfile.c, line: 739
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "la colonne maximale « %s » n'est pas valide"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
@@ -2893,8 +2891,8 @@ msgstr "l'argument %s contient un \" non fermé"
 # File: src/rcfile.c, line: 253
 # File: src/rcfile.c, line: 524
 # File: src/rcfile.c, line: 581
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 
@@ -2965,12 +2963,12 @@ msgstr "impossible de trouver la fonction « %s »"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "impossible de trouver le menu « %s »"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "La fonction « %s » n'existe pas dans le menu « %s »"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "désolé, le raccourci « %s » ne peut être réattribué"
@@ -3004,7 +3002,7 @@ msgstr "désolé, le raccourci « %s » ne peut être réattribué"
 # File: src/rcfile.c, line: 366
 # File: src/rcfile.c, line: 383
 # File: src/rcfile.c, line: 913
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erreur lors de l'expansion de %s : %s"
@@ -3012,7 +3010,7 @@ msgstr "Erreur lors de l'expansion de %s : %s"
 #
 # File: src/rcfile.c, line: 438
 # File: src/rcfile.c, line: 438
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -3032,7 +3030,7 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "un directive de coloration (color) doit être précédée d'une commande "
@@ -3041,28 +3039,28 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "nom de couleur manquant"
 
 #
 # File: src/rcfile.c, line: 503
 # File: src/rcfile.c, line: 503
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "chaîne d'expr. rationnelle manquante"
 
 #
 # File: src/rcfile.c, line: 575
 # File: src/rcfile.c, line: 575
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "« start » nécessite un « end » correspondant"
 
 #
 # File: src/rcfile.c, line: 485
 # File: src/rcfile.c, line: 485
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "une couleur de fond « %s » ne peut pas être lumineuse (bright)"
@@ -3070,7 +3068,7 @@ msgstr "une couleur de fond « %s » ne peut pas être lumineuse (bright)"
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "impossible d'ajouter un motif d'en-tête non précédé d'une commande « syntax »"
@@ -3078,55 +3076,54 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "impossible d'ajouter un motif Magic sans commande « syntax »"
 
 #
 # File: src/rcfile.c, line: 503
 # File: src/rcfile.c, line: 503
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "chaîne de motif Magic manquante"
 
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "impossible d'ajouter un analyseur statique sans commande « syntax »"
 
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Commande d'analyse statique manquante"
 
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "impossible d'ajouter un analyseur statique sans commande « syntax »"
+msgstr ""
+"Impossible d'ajouter un outil de mise en forme sans commande « syntax »"
 
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Commande d'analyse statique manquante"
+msgstr "Commande de l'outil de mise en forme manquante"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Erreur bloquante : aucun raccourci n'est associé à la fonction « %s ». "
 "Arrêt.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -3134,7 +3131,7 @@ msgstr ""
 "Si besoin, lancez nano avec l'option -I pour modifier les paramètres de "
 "votre fichier nanorc\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "impossible de trouver la syntaxe « %s » à étendre"
@@ -3146,7 +3143,7 @@ msgstr "impossible de trouver la syntaxe « %s » à étendre"
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
 # File: src/rcfile.c, line: 665
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "la commande « %s » est interdite dans un fichier inclus"
@@ -3156,7 +3153,7 @@ msgstr "la commande « %s » est interdite dans un fichier inclus"
 # File: src/rcfile.c, line: 838
 # File: src/rcfile.c, line: 671
 # File: src/rcfile.c, line: 838
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
@@ -3164,7 +3161,7 @@ msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
 #
 # File: src/rcfile.c, line: 680
 # File: src/rcfile.c, line: 680
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "impossible de comprendre la commande « %s »"
@@ -3172,14 +3169,14 @@ msgstr "impossible de comprendre la commande « %s »"
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Option manquante"
 
 #
 # File: src/rcfile.c, line: 708
 # File: src/rcfile.c, line: 708
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "l'option « %s » nécessite un argument"
@@ -3187,7 +3184,7 @@ msgstr "l'option « %s » nécessite un argument"
 #
 # File: src/rcfile.c, line: 726
 # File: src/rcfile.c, line: 726
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "l'option n'est pas une chaîne multioctet valide"
 
@@ -3198,21 +3195,21 @@ msgstr "l'option n'est pas une chaîne multioctet valide"
 # File: src/rcfile.c, line: 752
 # File: src/rcfile.c, line: 780
 # File: src/rcfile.c, line: 789
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "les blancs sont interdits"
 
 #
 # File: src/rcfile.c, line: 762
 # File: src/rcfile.c, line: 762
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "indiquez 2 caractères (mono-colonne)"
 
 #
 # File: src/rcfile.c, line: 828
 # File: src/rcfile.c, line: 828
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "impossible de désactiver l'option « %s »"
@@ -3220,7 +3217,7 @@ msgstr "impossible de désactiver l'option « %s »"
 #
 # File: src/rcfile.c, line: 834
 # File: src/rcfile.c, line: 834
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Option « %s » inconnue"
@@ -3228,7 +3225,7 @@ msgstr "Option « %s » inconnue"
 #
 # File: src/rcfile.c, line: 894
 # File: src/rcfile.c, line: 894
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 
@@ -3237,7 +3234,7 @@ msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -3260,7 +3257,7 @@ msgstr "« %.*s%s » non trouvé"
 # File: src/browser.c, line: 655
 # File: src/search.c, line: 183
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Resp. casse]"
 
@@ -3269,7 +3266,7 @@ msgstr " [Resp. casse]"
 # File: src/search.c, line: 189
 # File: src/browser.c, line: 661
 # File: src/search.c, line: 189
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Exp. ration.]"
 
@@ -3278,7 +3275,7 @@ msgstr " [Exp. ration.]"
 # File: src/search.c, line: 195
 # File: src/browser.c, line: 667
 # File: src/search.c, line: 195
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Arrière]"
 
@@ -3286,14 +3283,14 @@ msgstr " [Arrière]"
 # File: src/search.c, line: 199
 # File: src/search.c, line: 199
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (à remplacer) dans la sélection"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (à remplacer)"
 
@@ -3301,7 +3298,7 @@ msgstr " (à remplacer)"
 # File: src/search.c, line: 753
 # File: src/search.c, line: 753
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurrence ?"
 
@@ -3309,14 +3306,14 @@ msgstr "Remplacer cette occurrence ?"
 # File: src/search.c, line: 921
 # File: src/search.c, line: 921
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Remplacer par"
 
 #
 # File: src/search.c, line: 963
 # File: src/search.c, line: 963
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -3327,28 +3324,28 @@ msgstr[1] "%lu remplacements effectués"
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Entrez : numéro de ligne, numéro de colonne "
 
 #
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "numéro de ligne ou de colonne incorrect"
 
 #
 # File: src/search.c, line: 1167
 # File: src/search.c, line: 1167
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "N'est pas un crochet"
 
 #
 # File: src/search.c, line: 1234
 # File: src/search.c, line: 1234
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
@@ -3370,12 +3367,12 @@ msgstr "Marque enlevée"
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Erreur interne : pas de correspondance pour la ligne %ld. Sauvez votre "
-"travail."
+"Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
+"Sauvez votre travail."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -3439,13 +3436,6 @@ msgstr ""
 "Erreur interne : impossible de préparer le retour en avant. Sauvez votre "
 "travail."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
-"Sauvez votre travail."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
@@ -3454,7 +3444,7 @@ msgstr "Action refaite (%s)"
 #
 # File: src/text.c, line: 1944
 # File: src/text.c, line: 1944
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Impossible de créer un tube"
 
@@ -3465,8 +3455,8 @@ msgstr "Impossible de créer un tube"
 # File: src/text.c, line: 468
 # File: src/text.c, line: 2032
 # File: src/text.c, line: 2179
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
@@ -3508,7 +3498,7 @@ msgstr "Création de la liste des fautes, veuillez patienter..."
 #
 # File: src/text.c, line: 2038
 # File: src/text.c, line: 2038
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Impossible d'obtenir la taille de tampon du tube"
 
@@ -3536,14 +3526,14 @@ msgstr "erreur à l'appel de « uniq »"
 #
 # File: src/text.c, line: 2351
 # File: src/text.c, line: 2351
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
 #
 # File: src/text.c, line: 2206
 # File: src/text.c, line: 2206
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "erreur d'appel de « %s »"
@@ -3551,14 +3541,14 @@ msgstr "erreur d'appel de « %s »"
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Appel du correcteur orthographique, veuillez patienter"
 
 #
 # File: src/text.c, line: 2346
 # File: src/text.c, line: 2346
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
@@ -3566,7 +3556,7 @@ msgstr "Échec de la correction : %s"
 #
 # File: src/text.c, line: 2348
 # File: src/text.c, line: 2348
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Échec de la correction : %s : %s"
@@ -3574,24 +3564,24 @@ msgstr "Échec de la correction : %s : %s"
 #
 # File: src/nano.c, line: 764
 # File: src/nano.c, line: 764
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Sauver l'espace modifié avant l'analyse statique ?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Lancement de l'analyse statique, veuillez patienter"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "La commande « %s » n'a produit aucune ligne analysable"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
@@ -3601,38 +3591,37 @@ msgstr ""
 #
 # File: src/nano.c, line: 735
 # File: src/nano.c, line: 735
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Dernier message"
 
 #
 # File: src/nano.c, line: 735
 # File: src/nano.c, line: 735
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Premier message"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erreur : aucun formateur n'est défini"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Terminé"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Lancement de l'analyse statique, veuillez patienter"
+msgstr "Lancement de la mise en forme, veuillez patienter"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Mise en forme terminée"
 
 #
 # File: src/text.c, line: 2416
 # File: src/text.c, line: 2416
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s %lu mots,  %ld lignes, %lu caractères"
@@ -3640,7 +3629,7 @@ msgstr "%s %lu mots,  %ld lignes, %lu caractères"
 #
 # File: src/text.c, line: 2417
 # File: src/text.c, line: 2417
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Contenu de la sélection : "
 
@@ -3651,7 +3640,7 @@ msgstr "Contenu de la sélection : "
 # File: src/text.c, line: 2431
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Entrée telle quelle"
 
@@ -3759,7 +3748,7 @@ msgstr "La Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "les nombreux traducteurs et le TP"
 
 #
 # File: src/winio.c, line: 3171
@@ -3782,6 +3771,11 @@ msgstr "et toute autre personne que nous aurions oubliée..."
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erreur interne : pas de correspondance pour la ligne %ld. Sauvez votre "
+#~ "travail."
+
 #
 # File: src/global.c, line: 1318
 # File: src/global.c, line: 1318
diff --git a/po/ga.po b/po/ga.po
index 5401f43d1b394f70759f9f6a5659488e804c17f6..60f82695f50e7c7d83f69482389d7b84190805f2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2008-10-23 15:14-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cealaithe"
 
@@ -37,7 +37,7 @@ msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
@@ -60,20 +60,20 @@ msgid "(parent dir)"
 msgstr "téigh suas"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Thimfhill an Cuardach"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Níor aimsíodh an patrún in aon áit eile"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
@@ -236,12 +236,12 @@ msgstr "Comhad Nua"
 msgid "\"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
@@ -303,8 +303,8 @@ msgstr "An iomarca comhad cúltaca?"
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
@@ -1685,16 +1685,16 @@ msgid "Enable soft line wrapping"
 msgstr "Timfhilleadh líne"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " R-phost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1703,67 +1703,67 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tá brón orm, díchumasaíodh an fheidhm seo"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sábháil an maolán athraithe (NÓ SCRIOSFAR DO CHUID ATHRUITHE) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun dul ar ais go nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ordú Anaithnid"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XON :-("
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XOFF :-("
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid líonta iarrtha \"%s\""
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1805,8 +1805,8 @@ msgstr "Earráid i %s ar líne %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Ní mór carachtar \" a bheith ag tosach agus ag deireadh sloinn ionadaíochta"
@@ -1861,22 +1861,22 @@ msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go feidhm\n"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tá brón orm, ceangal neamhcheadaithe é keystr \"%s\"\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1891,69 +1891,69 @@ msgstr ""
 "\"black\", leis an réimír roghnach \"bright\"\n"
 "le haghaidh dathanna tulra."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr ""
 "Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Earráid mharfach: níl aon eochracha mapáilte le haghaidh feidhm \"%s\""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1961,63 +1961,63 @@ msgstr ""
 "Á scor.  Úsáid nano leis an rogha -I más gá do chuid socruithe nanorc a "
 "athrú\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Níl an rogha ina teaghrán bailí il-bhirt"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Bratach anaithnid \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2032,38 +2032,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" gan aimsiú"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Cásíogair]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Slonn]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Siar]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (le cur in ionad) i roghnúchán"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (le cur in ionad)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ionadaigh an ceann seo?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ionadaigh le"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2074,19 +2074,19 @@ msgstr[3] "Cuireadh teaghrán nua in ionad %lu n-uaire"
 msgstr[4] "Cuireadh teaghrán nua in ionad %lu uair"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Iontráil uimhir na líne agus uimhir an cholúin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ní lúibín é"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
@@ -2102,9 +2102,9 @@ msgstr "Díshocraíodh Marc"
 msgid "Nothing in undo buffer!"
 msgstr "Níl faic le cealú!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir líne %d a mheaitseáil.  Sábháil do chuid oibre"
 
@@ -2159,23 +2159,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Earráid inmheánach: ní féidir líne %d a mheaitseáil.  Sábháil do chuid oibre"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
@@ -2202,7 +2196,7 @@ msgstr "Cuir ionadaí in eagar"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta d'fhocail mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Níl aon fháil ar mhéid an mhaoláin píopa"
 
@@ -2218,91 +2212,91 @@ msgstr "Earráid agus \"sort -f\" á thosú"
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Taispeáin an teachtaireacht seo"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Taispeáin an teachtaireacht seo"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Ionchur Litriúil"
 
diff --git a/po/gl.po b/po/gl.po
index d2762202945448642fdb652e036f0cc616613069..2de252bbe12a66560dda5e8f52cbb5e2dd118601 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,15 +1,15 @@
 # Galician translation of nano
-# Copyright (C) 2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2006, 2008, 2011, 2012, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Jacobo Tarrio <jtarrio@trasno.net>, 2001, 2002, 2003.
-# Francisco Javier Tsao Santín <tsao@enelparaiso.org>, 2006, 2008, 2011, 2012.
+# Francisco Javier Tsao Santín <tsao@enelparaiso.org>, 2006, 2008, 2011, 2012, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.0\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2012-07-02 16:45+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-18 23:36+0100\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@enelparaiso.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -37,7 +37,7 @@ msgstr "Non se pode saír de %s en modo restrinxido"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s: %s"
@@ -59,62 +59,64 @@ msgid "(parent dir)"
 msgstr "(dir pai)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Busca"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Esta é a única aparición"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
 #: src/files.c:139
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
+"Non se puido determina-la miña identidade para bloquea-lo ficheiro (fallou "
+"getpwuid())"
 
 #: src/files.c:145
 #, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr ""
+msgstr "Non se puido determina-lo nome do host para bloquea-lo ficheiro: %s"
 
 #: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro escribindo ficheiro de bloqueo %s: %s"
 
 #: src/files.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro borrando ficheiro de bloqueo %s: %s"
 
 #: src/files.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro abrindo ficheiro de bloqueo %s: %s"
 
 #: src/files.c:282
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
-msgstr ""
+msgstr "Erro lendo ficheiro de bloqueo %s: Non abondan datos para ler"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "O ficheiro %s está sendo editado (por %s con %s, PID %d); ¿continuar?"
 
 #: src/files.c:308
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing lock file: Directory '%s' doesn't exist"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro escribindo ficheiro de bloqueo: Non existe o directorio '%s'"
 
 #: src/files.c:339
 #, c-format
@@ -223,12 +225,12 @@ msgstr "Ficheiro Novo"
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
@@ -260,7 +262,7 @@ msgstr "Tecla non válida no modo sen multibuffer"
 #: src/files.c:1622
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
-"Faio ó escribir arquivo de respaldo, ¿continuar gravando? (Prema N se non "
+"Faio ó escribir ficheiro de respaldo, ¿continuar gravando? (Prema N se non "
 "está seguro)"
 
 #: src/files.c:1746
@@ -278,7 +280,7 @@ msgstr ""
 #: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro escribindo ficheiro de copia de seguridade %s: %s"
 
 #: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
@@ -292,8 +294,8 @@ msgstr "¿Demasiados ficheiros de copia de seguridade?"
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
@@ -351,7 +353,7 @@ msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
 #: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr "O ficheiro foi modificado dende que o abriu, ¿continua grabando?"
+msgstr "O ficheiro foi modificado dende que o abriu, ¿continua gravando?"
 
 #: src/files.c:2882
 msgid "(more)"
@@ -367,7 +369,7 @@ msgstr ""
 "Prema Enter para continuar.\n"
 
 #: src/files.c:2989
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
@@ -376,7 +378,7 @@ msgstr ""
 "Requírese para gravar/cargar o historial de busca ou posición do cursor\n"
 
 #: src/files.c:2995
-#, fuzzy, c-format
+#, 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"
@@ -391,7 +393,7 @@ msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Detectouse un arquivo de historial anticuado (%s) que tentei mover\n"
+"Detectouse un ficheiro de historial anticuado (%s) que tentei mover\n"
 "á localización preferente (%s) pero topei cun erro: %s"
 
 #: src/files.c:3016
@@ -401,7 +403,7 @@ msgid ""
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
-"Detectouse un arquivo de historial anticuado (%s) que movín\n"
+"Detectouse un ficheiro de historial anticuado (%s) que movín\n"
 "á localización preferente (%s)\n"
 "(lea no FAQ de nano sobre este cambio)"
 
@@ -415,12 +417,10 @@ msgid "Close"
 msgstr "Pechar"
 
 #: src/global.c:479
-#, fuzzy
 msgid "Uncut Text"
 msgstr "RepórTexto"
 
 #: src/global.c:481
-#, fuzzy
 msgid "Unjustify"
 msgstr "DeXustif"
 
@@ -497,19 +497,16 @@ msgid "Search for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
 #: src/global.c:526
-#, fuzzy
 msgid "Search for a string"
-msgstr "Buscar cadea ou experesión regular"
+msgstr "Buscar cadea"
 
 #: src/global.c:528
-#, fuzzy
 msgid "Go one screenful up"
-msgstr "Pasar á seguinte pantalla"
+msgstr "Subir unha pantalla"
 
 #: src/global.c:529
-#, fuzzy
 msgid "Go one screenful down"
-msgstr "Pasar á seguinte pantalla"
+msgstr "Baixar unha pantalla"
 
 #: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
@@ -536,12 +533,10 @@ msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
 #: src/global.c:541
-#, fuzzy
 msgid "Mark text starting from the cursor position"
-msgstr "Marcar texto na posición do cursor"
+msgstr "Marcar texto comenzando na posición do cursor"
 
 #: src/global.c:542
-#, fuzzy
 msgid "Repeat the last search"
 msgstr "Repeti-la última busca"
 
@@ -750,22 +745,18 @@ msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
 #: src/global.c:639
-#, fuzzy
 msgid "Invoke the linter, if available"
-msgstr "Chamar ó corrector ortográfico, se hai un"
+msgstr "Chamar ó analizador de sintaxe, se hai un"
 
 #: src/global.c:640
-#, fuzzy
 msgid "Go to previous linter msg"
-msgstr "Pasar á liña previa"
+msgstr "Pasar á anterior mensaxe do analizador"
 
 #: src/global.c:641
-#, fuzzy
 msgid "Go to next linter msg"
-msgstr "Pasar á seguinte liña"
+msgstr "Pasar á anterior mensaxe do analizador"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
@@ -779,7 +770,6 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/global.c:678
-#, fuzzy
 msgid "Write Out"
 msgstr "Gravar"
 
@@ -800,14 +790,12 @@ msgid "To Spell"
 msgstr "Ortografía"
 
 #: src/global.c:738
-#, fuzzy
 msgid "To Linter"
-msgstr "Ir á liña"
+msgstr "Analizador"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Formato DOS"
+msgstr "Formateador"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -846,9 +834,8 @@ msgid "Last Line"
 msgstr "Ult liña"
 
 #: src/global.c:794
-#, fuzzy
 msgid "To Bracket"
-msgstr "Non hai delimitador"
+msgstr "Ó delimitador"
 
 #: src/global.c:797
 msgid "Mark Text"
@@ -915,7 +902,6 @@ msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
 #: src/global.c:858
-#, fuzzy
 msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
@@ -924,7 +910,6 @@ msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
 #: src/global.c:869
-#, fuzzy
 msgid "Verbatim"
 msgstr "Entrada Literal"
 
@@ -1005,14 +990,12 @@ msgid "Last File"
 msgstr "Derrad Fich"
 
 #: src/global.c:977
-#, fuzzy
 msgid "Prev Lint Msg"
-msgstr "Liña Ant"
+msgstr "Msg ant anlzr"
 
 #: src/global.c:979
-#, fuzzy
 msgid "Next Lint Msg"
-msgstr "Seg Liña"
+msgstr "Msg seg anlzr"
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
@@ -1030,12 +1013,11 @@ msgstr "Uso dunha liña máis para editar"
 
 #: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Desprazar suavemente"
+msgstr "Desprazar mainamente"
 
 #: src/global.c:1235
-#, fuzzy
 msgid "Soft wrapping of overlong lines"
-msgstr "Non corta-las liñas longas"
+msgstr "Acortado maino de liñas longas"
 
 #: src/global.c:1237
 msgid "Whitespace display"
@@ -1058,9 +1040,8 @@ msgid "Cut to end"
 msgstr "Cortar ata o final"
 
 #: src/global.c:1247
-#, fuzzy
 msgid "Hard wrapping of overlong lines"
-msgstr "Non corta-las liñas longas"
+msgstr "Acortado forte de liñas longas"
 
 #: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
@@ -1264,7 +1245,7 @@ msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" As seguintes teclas de función están dispoñibles no modo de Busca do "
+" As seguintes teclas de función están dispoñibles no modo de Busca do "
 "Navegador:\n"
 "\n"
 
@@ -1492,7 +1473,7 @@ msgstr "Admitir varios buffers de ficheiros"
 
 #: src/nano.c:865
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Usar ficheiros de bloqueo (estilo vim)"
 
 #: src/nano.c:869
 msgid "Log & read search/replace string history"
@@ -1587,7 +1568,6 @@ msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arranxa-lo problema de confusión Retroceso/Borrar"
 
 #: src/nano.c:915
-#, fuzzy
 msgid "Show this help text"
 msgstr "Amosar este texto de axuda"
 
@@ -1609,7 +1589,7 @@ msgstr "Emprega-lo rato"
 
 #: src/nano.c:926
 msgid "Do not read the file (only write it)"
-msgstr ""
+msgstr "Non ler o ficheiro (só escribir nel)"
 
 #: src/nano.c:928
 msgid "-o <dir>"
@@ -1640,9 +1620,8 @@ msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
 #: src/nano.c:939
-#, fuzzy
 msgid "Set hard-wrapping point at column #cols"
-msgstr "Establecer punto de corte na columna #cols"
+msgstr "Establecer punto de corte forte na columna #cols"
 
 #: src/nano.c:942
 msgid "-s <prog>"
@@ -1665,9 +1644,8 @@ msgid "View mode (read-only)"
 msgstr "Modo visualización (só lectura)"
 
 #: src/nano.c:949
-#, fuzzy
 msgid "Don't hard-wrap long lines"
-msgstr "Non corta-las liñas longas"
+msgstr "Non facer cortado forte liñas longas"
 
 #: src/nano.c:951
 msgid "Don't show the two help lines"
@@ -1683,15 +1661,15 @@ msgstr "Activar axuste suave de liñas"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versión %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1700,71 +1678,71 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Sentímolo, desactivouse o soporte desta función"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
-msgstr ""
+msgstr "Non hai nome de ficheiro"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 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:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo dende a stdin, ^C para abortar\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando Descoñecido"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Iñórase XON, hmmmm..."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Iñórase XOFF, hmmmm..."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr ""
+msgstr "Escriba '%s -h' para a lista de opcións dispoñibles.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
@@ -1803,8 +1781,8 @@ msgstr "Erro en %s na liña %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "As cadeas de expresión regular deben comezar e rematar cun carácter \" "
@@ -1832,51 +1810,47 @@ msgstr "Falla o nome de tecla"
 
 #: src/rcfile.c:442 src/rcfile.c:453
 msgid "Key name is too short"
-msgstr ""
+msgstr "O nome da tecla é demasiado curto"
 
 #: src/rcfile.c:463
-#, fuzzy
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-"as asociacións a combinacións de teclas deben comenzar con \"^\",\"M\", ou "
-"\"F\""
+msgstr "O nome de tecla debe comenzar con \"^\",\"M\", ou \"F\""
 
 #: src/rcfile.c:472
-#, fuzzy
 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:482
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
-msgstr ""
+msgstr "Debe especificar un menú (ou \"all\") no que asociar/liberar a tecla"
 
 #: src/rcfile.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot map name \"%s\" to a function"
 msgstr "Non se puido sinalar o nome \"%s\" para unha función"
 
 #: src/rcfile.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr ""
+msgstr "A función '%s' non existe no menú '%s'"
 
-#: src/rcfile.c:539
-#, fuzzy, c-format
+#: src/rcfile.c:543
+#, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr "Síntoo, keystr \"%s\" é una asociación ilegal"
+msgstr "Síntoo, a combinación \"%s\" non se pode restablecer"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:629
+#, c-format
 msgid "Error expanding %s: %s"
-msgstr "Erro lendo %s: %s"
+msgstr "Erro expandindo %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1891,136 +1865,129 @@ msgstr ""
 "\"black\", co prefixo opcional \"bright\".\n"
 "\"para cores de fronte."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Perdeuse a cadea de expreg"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "A cor de fondo \"%s\" non pode ser relucinte"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Non se pode engadir unha cabeceira de expresión regular sen unha directiva "
 "de sintaxe"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Non se pode engadir unha cadea máxica de expresión regular sen unha "
 "directiva de sintaxe"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Perdeuse o nome de cadea máxica"
 
-#: src/rcfile.c:981
-#, fuzzy
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
-msgstr ""
-"Non se pode engadir unha cabeceira de expresión regular sen unha directiva "
-"de sintaxe"
+msgstr "Non se pode engadir un analizador sen unha directiva de sintaxe"
 
-#: src/rcfile.c:986
-#, fuzzy
+#: src/rcfile.c:990
 msgid "Missing linter command"
-msgstr "Falla o nome da cor"
+msgstr "Falla a directiva de analizador"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr ""
-"Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
+msgstr "Non se pode engadir un formateador sen unha directiva de sintaxe "
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr ""
+msgstr "Directiva de formato non atopado"
 
-#: src/rcfile.c:1041
-#, fuzzy, c-format
+#: src/rcfile.c:1045
+#, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
-msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\""
+msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\". Saíndo.\n"
 
-#: src/rcfile.c:1043
-#, fuzzy, c-format
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saíndo. Por favor, use nano coa opción -I se precisa axeita-la súa "
-"configuración no nanorc\n"
+"Se o precisa, use nano coa opción -I se precisa axeita-la súa configuración "
+"no nanorc\n"
 
-#: src/rcfile.c:1104
-#, fuzzy, c-format
+#: src/rcfile.c:1108
+#, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr "Non se puido sinalar o nome \"%s\" para un menu"
+msgstr "Non se puido atopar sintaxe \"%s\" para extender"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "O comando \"%s\" non se permite no ficheiro incluído"
+msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Non se entende o comando \"%s\""
+msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:1182
-#, fuzzy
+#: src/rcfile.c:1186
 msgid "Missing option"
-msgstr "Falla o nome da cor"
+msgstr "Opción non atopada"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1335
-#, fuzzy, c-format
+#: src/rcfile.c:1339
+#, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "Non se pode desactiva-lo indicador \"%s\""
+msgstr "Non se pode desactivar opción \"%s\""
 
-#: src/rcfile.c:1341
-#, fuzzy, c-format
+#: src/rcfile.c:1345
+#, c-format
 msgid "Unknown option \"%s\""
-msgstr "Indicador descoñecido \"%s\""
+msgstr "Opción descoñecida \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2035,38 +2002,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "non se atopou \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Sensible ás Maiúsculas/Minúsculas]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Expreg]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Cara Atrás]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr "(para substituír) na selección"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(para substituír)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "¿Substituír?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Substituír por"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2074,19 +2041,19 @@ msgstr[0] "Fíxose %lu substitución"
 msgstr[1] "Fixéronse %lu substitucións"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduza liña número, columna número"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non hai delimitador"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
@@ -2102,9 +2069,9 @@ msgstr "Marca desactivada"
 msgid "Nothing in undo buffer!"
 msgstr "Buffer para desfacer baleiro"
 
-#: src/text.c:445
-#, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Erro interno: non podo atopar a liña %d. Por favor, grave o seu traballo "
 
@@ -2154,34 +2121,26 @@ msgid "Nothing to re-do!"
 msgstr "Nada para refacer"
 
 #: src/text.c:584
-#, fuzzy
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
 "seu traballo."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Erro interno: non podo atopar a liña %d. Por favor, grave o seu traballo "
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
 #: src/text.c:969
-#, fuzzy
 msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
@@ -2204,7 +2163,7 @@ msgstr "Editar unha substitución"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
@@ -2220,91 +2179,87 @@ msgstr "Erro ó chamar \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:2889
-#, fuzzy
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
-msgstr "Chamar ó corrector ortográfico, se hai un"
+msgstr "Chamar ó corrector ortográfico, agarde, por favor"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:2941
-#, fuzzy
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
-msgstr "Non engadir novas liñas ó final dos ficheiros"
+msgstr "Non hai definido analizador para este tipo de ficheiros"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
-msgstr ""
+msgstr "Gravar o buffer modificado antes da análise"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
-msgstr ""
+msgstr "Invocando analizador de sintaxe, por favor, espere"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr ""
+msgstr "Atopáronse 0 liñas analizables pola directiva: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
-msgstr ""
+msgstr "Esta mensaxe é polo ficheiro pechado %s, ¿abrir nun novo buffer?"
 
-#: src/text.c:3209
-#, fuzzy
+#: src/text.c:3205
 msgid "At last message"
-msgstr "Amosar esta mensaxe"
+msgstr "No final da mensaxe"
 
-#: src/text.c:3214
-#, fuzzy
+#: src/text.c:3210
 msgid "At first message"
-msgstr "Amosar esta mensaxe"
+msgstr "No comenzo da mensaxe"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erro: non hai formateador definido"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Finalizado"
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr ""
+msgstr "Chamando ó formateador, por favor, agarde"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Finalizou o formateado"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Entrada Literal"
 
@@ -2339,6 +2294,8 @@ msgstr "Ficheiro:"
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
+"Aviso: Modificando un ficheiro que non está bloqueado, ¿revisar os permisos "
+"do directorio?"
 
 #: src/winio.c:3377
 #, c-format
@@ -2367,7 +2324,7 @@ msgstr "A Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "os moitos tradutores e o TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2381,46 +2338,6 @@ msgstr "e a todos os que esquencemos..."
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
-#~ msgid "Insert File"
-#~ msgstr "Inser Fich"
-
-#~ msgid "Go to previous screen"
-#~ msgstr "Pasar á pantalla anterior"
-
-#~ msgid "Find Other Bracket"
-#~ msgstr "Busca-la parella"
-
-#~ msgid "Long line wrapping"
-#~ msgstr "Axuste de liñas longas"
-
-#~ msgid "Soft line wrapping"
-#~ msgstr "Axuste suave de liñas"
-
-#~ msgid "Allow generic undo [EXPERIMENTAL]"
-#~ msgstr "Permitir desfacer xenérico [EXPERIMENTAL]"
-
-#~ msgid "(ignored, for Pico compatibility)"
-#~ msgstr "(iñorado, por compatibilidade con Pico)"
-
-#~ msgid "Must specify menu to bind key to (or \"all\")"
-#~ msgstr "Debe especifica-lo menú de asociación de tecla (ou \"all\")"
-
-#~ msgid "Missing flag"
-#~ msgstr "Falla o indicador"
-
-#~ msgid "line wrap"
-#~ msgstr "Axuste de liñas"
-
-#~ msgid "Internal error: unknown type.  Please save your work"
-#~ msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
-
-#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Erro interno: fallou a configuracion de refacer. Por favor, grave o seu "
-#~ "traballo "
-
-#~ msgid "Could not pipe"
-#~ msgstr "Non se puido crear unha canle"
-
-#~ msgid "line split"
-#~ msgstr "dividir liña"
+#~ "Erro interno: non podo atopar a liña %ld. Por favor, grave o seu traballo "
diff --git a/po/hu.po b/po/hu.po
index 720da52c7680cc0b7dda44c7955ac6e7228edc2a..5a93e0fddf6962186a74871959993f2e9599ab3e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.2pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2010-03-03 12:57+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -27,8 +27,8 @@ msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Megszakítva"
 
@@ -40,7 +40,7 @@ msgstr "Korlátozott módban nem léphet ki a következőből: %s"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
@@ -62,20 +62,20 @@ msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Keresés"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "A keresés körbeért"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ez az egyetlen előfordulás"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
@@ -226,12 +226,12 @@ msgstr "Új fájl"
 msgid "\"%s\" not found"
 msgstr "„%s” nem található"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s” egy könyvtár"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s” egy eszközfájl"
@@ -293,8 +293,8 @@ msgstr "Túl sok biztonsági mentés van?"
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s” írása közben: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
@@ -1696,16 +1696,16 @@ msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano %s verzió. (fordítva: %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1714,68 +1714,68 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Elnézést, a funkció támogatása ki van kapcsolva"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Menti a változtatásokat („NEM” VÁLASZ ESETÉN MINDEN MÓDOSÍTÁS ELVÉSZ)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Az stdin nem nyitható újra a billentyűzetről.\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Olvasás stdinről, ^C megszakítja\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg” kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ismeretlen parancs"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON kihagyva, ej-ej"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF kihagyva, ej-ej"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s” tabméret érvénytelen"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s” kitöltésméret érvénytelen"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1817,8 +1817,8 @@ msgstr "Hiba a(z) %s %lu. sorában: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "A reguláris kifejezéseknek \" karakterekkel kezdődniük és végződniük"
 
@@ -1873,22 +1873,22 @@ msgstr "A név („%s”) nem képezhető le funkcióra"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "A név („%s”) nem képezhető le menüre"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "A billentyű-karakterlánc („%s”) nem érvényes kötés"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1902,66 +1902,66 @@ msgstr ""
 "„white”, „yellow”, „cyan”, „magenta” és \n"
 "„black”, opcionális „bright” előtaggal az előtérszínekhez."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nem adható meg színparancs szintaxissor nélkül"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Hiányzó regex karaktersorozat"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=” -hoz kell egy megfelelő „end=”"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "A(z) „%s” háttérszín nem lehet világos"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Hiányzó regex karaktersorozat"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Nem adható meg színparancs szintaxissor nélkül"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Végzetes hiba: nincsenek billentyűk leképezve a függvényhez („%s”)"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1969,63 +1969,63 @@ msgstr ""
 "Kilépés. Használja a nanot a -I kapcsolóval, ha módosítani kívánja a nanorc "
 "beállításait\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "A név („%s”) nem képezhető le menüre"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "A(z) „%s” parancs nem engedélyezett a tartalmazott fájlban"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s” szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s” parancs nem értelmezhető"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s” kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A kapcsoló nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "A(z) „%s” jelző nem állítható vissza"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ismeretlen jelző: „%s”"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2040,38 +2040,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "A(z) „%.*s%s” nem található"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [kis/Nagy]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Vissza]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (cseréhez) a kijelölésben"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (cseréhez)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Lecseréli ezt a találatot?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Csere ezzel"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2079,19 +2079,19 @@ msgstr[0] "%lu előfordulás cserélve"
 msgstr[1] "%lu előfordulás cserélve"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kérem a sor, oszlop számát"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Nem zárójel"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
@@ -2107,9 +2107,9 @@ msgstr "Kijelölés vége"
 msgid "Nothing in undo buffer!"
 msgstr "A visszavonási puffer üres!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Belső hiba: a(z) %d. sor nem illeszthető. Mentse a munkáját."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2163,22 +2163,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Belső hiba: a kivágás visszavonása nem állítható be. Mentse a munkáját."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Belső hiba: a(z) %d. sor nem illeszthető. Mentse a munkáját."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Nem hozható létre a cső"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
@@ -2205,7 +2200,7 @@ msgstr "A helyettesítő érték módosítása"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
@@ -2221,91 +2216,91 @@ msgstr "Hiba a „sort -f” meghívásakor"
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq” meghívásakor"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s” meghívásakor"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ne adjon új sorokat a fájlok végéhez"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Ezen üzenet kiírása"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Ezen üzenet kiírása"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Szó szerinti bevitel"
 
diff --git a/po/id.po b/po/id.po
index 28b83461a5bf32327e200eb51fcd90f35035cb53..ed41f0f0df4d4ff296a5222e22799e7cf46ffd4b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2003-04-23 09:41+0000\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Ke Direktori"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -37,7 +37,7 @@ msgstr "Tidak dapat keluar %s dalam mode terbatas"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian Di-wrapped"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya ini adanya"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
@@ -204,12 +204,12 @@ msgstr "File Baru"
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
@@ -273,8 +273,8 @@ msgstr ""
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -1704,16 +1704,16 @@ msgid "Enable soft line wrapping"
 msgstr ""
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1722,69 +1722,69 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, dukungan untuk fungsi ini telah ditiadakan"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1826,8 +1826,8 @@ msgstr "Kesalahan dalam %s pada baris %d: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "String regexp harus dimulai dan diakhiri dengan sebuah karakter \"\n"
@@ -1881,22 +1881,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1910,130 +1910,130 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" dan \n"
 "\"black\", dengan prefiks opsional \"bright\".\n"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2048,59 +2048,59 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (ganti)"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (ganti)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:993
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d tempat terganti"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Masukkan nomor baris"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
@@ -2117,9 +2117,9 @@ msgstr "Unset Tanda"
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2174,22 +2174,17 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
@@ -2214,7 +2209,7 @@ msgstr "Edit pengganti"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
@@ -2230,92 +2225,91 @@ msgstr "Gagal memanggil \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Tampilkan pesan ini"
 
-#: src/text.c:3255
-#, fuzzy
-msgid "Error: no linter defined"
-msgstr "Kesalahan dalam %s pada baris %d: "
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3446
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 785d9862a81d3f8cac7b2f956eb6fa20f1f674b3..9cb9338db5b5b148486f2a246f67e3a31ee520e3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,10 +5,10 @@
 # Marco Colombo <m.colombo@ed.ac.uk>, 2001-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.3pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-05-25 17:37+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 10:22+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -23,8 +23,8 @@ msgid "Go To Directory"
 msgstr "Vai alla directory"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annullato"
 
@@ -36,7 +36,7 @@ msgstr "Impossibile uscire da %s in modalità ristretta"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
@@ -58,20 +58,20 @@ msgid "(parent dir)"
 msgstr "(dir super)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ricerca"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Ricerca ricominciata"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Questa è l'unica occorrenza"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
@@ -112,11 +112,13 @@ msgstr ""
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
+"Il file %s sta venendo modificato (da %s usando %s, PID %d). Continuare?"
 
 #: src/files.c:308
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing lock file: Directory '%s' doesn't exist"
-msgstr "Errore durante la scrittura del file di lock %s: %s"
+msgstr ""
+"Errore durante la scrittura del file di lock: directory \"%s\" non esiste"
 
 #: src/files.c:339
 #, c-format
@@ -221,12 +223,12 @@ msgstr "Nuovo file"
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di device"
@@ -288,8 +290,8 @@ msgstr "Troppi file di backup?"
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
@@ -363,23 +365,23 @@ msgstr ""
 "Premere Invio per continuare\n"
 
 #: src/files.c:2989
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 "Impossibile creare la directory %s: %s\n"
-"È richiesta per salvare/caricare le ricerche o la posizione del cursore\n"
+"È richiesta per salvare/caricare le ricerche o le posizioni del cursore.\n"
 
 #: src/files.c:2995
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 "Il percorso %s non è una directory, ma è necessario che lo sia.\n"
-"Nano non sarà in grado di caricare o salvare le ricerche o la posizione del "
-"cursore\n"
+"Nano non sarà in grado di caricare o salvare le ricerche o le posizioni del "
+"cursore.\n"
 
 #: src/files.c:3012
 #, c-format
@@ -759,9 +761,8 @@ msgid "Go to next linter msg"
 msgstr "Va al messaggio successivo del linter"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Esegue il linter, se disponibile"
+msgstr "Esegue il formattatore, se disponibile"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -797,9 +798,8 @@ msgid "To Linter"
 msgstr "Linter"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Formato DOS"
+msgstr "Formattatore"
 
 # FIXME
 #: src/global.c:745
@@ -1671,15 +1671,15 @@ msgstr "Abilita interruzione morbida delle righe"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versione %s (compilato %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versione %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1688,71 +1688,71 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Il supporto per questa funzionalità è stato disabilitato"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
-msgstr ""
+msgstr "Nessun nome di file"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE MODIFICHE) "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lettura dallo stdin, ^C per interrompere\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando sconosciuto"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorato, mmm..."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorato, mmm..."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr "Usare '%s -h' per elencare le opzioni disponibili.\n"
+msgstr "Usare \"%s -h\" per elencare le opzioni disponibili.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
@@ -1791,8 +1791,8 @@ msgstr "Errore in %s alla riga %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
@@ -1844,22 +1844,22 @@ msgstr "Impossibile associare il nome \"%s\" a una funzione"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossibile associare il nome \"%s\" a un menù"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr ""
+msgstr "La funzione \"%s\" non esiste nel menù \"%s\""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La chiave \"%s\" non può essere reimpostata"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Errore durante l'espansione di %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1874,70 +1874,68 @@ msgstr ""
 "\"black\", con il prefisso opzionale \"bright\"\n"
 "per i colori di primo piano."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Impossibile aggiungere una direttiva di colore senza una riga di sintassi"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Stringa di espressione regolare mancante"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
 
 # FIXME
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
 
 # FIXME
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
 
 # FIXME
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Stringa di intestazione mancante"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
-msgstr "Comando linter mancante"
+msgstr "Comando del linter mancante"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
+msgstr "Impossibile aggiungere un formattatore senza una riga di sintassi"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Comando linter mancante"
+msgstr "Comando del formattatore mancante"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Errore fatale: nessuna chiave associata alla funzione \"%s\". Uscita.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1945,63 +1943,63 @@ msgstr ""
 "Usare nano con l'opzione -I se occorre modificare le impostazioni di "
 "nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
 # FIXME
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintassi \"%s\" non ha direttive di colore"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Opzione mancante"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opzione non è una stringa multibyte valida"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Impossibile rimuovere l'opzione \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opzione \"%s\" sconosciuta"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2017,38 +2015,38 @@ msgstr "\"%.*s%s\" non trovato"
 
 # FIXME
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Maiuscole/Minuscole]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Espressione regolare]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [All'indietro]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (sostituisci) nella selezione"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Sostituire questa occorrenza?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Sostituire con"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2056,19 +2054,19 @@ msgstr[0] "%lu sostituzione effettuata"
 msgstr[1] "%lu sostituzioni effettuate"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Inserire il numero di riga, numero di colonna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non è una parentesi"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
@@ -2085,9 +2083,9 @@ msgid "Nothing in undo buffer!"
 msgstr "Buffer di annullamento vuoto."
 
 # FIXME
-#: src/text.c:445
-#, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
 "il lavoro."
@@ -2142,25 +2140,17 @@ msgstr "Niente da ripetere."
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Errore interno: impossibile ripetere. Salvare il lavoro."
 
-# FIXME
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
-"il lavoro."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Impossibile creare la pipe"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
@@ -2185,7 +2175,7 @@ msgstr "Modifica sostituzione"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
@@ -2201,89 +2191,88 @@ msgstr "Errore nel chiamare \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Esecuzione del correttore ortografico, attendere"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Nessun linter definito per questo tipo di file!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Salvare il buffer prima dell'esecuzione del linter?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Esecuzione del linter, attendere"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Ricevute 0 righe dal comando: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Questo messaggio è per il file non aperto %s, aprire in un nuovo buffer?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Ultimo messaggio"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Primo messaggio"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Errore: nessun formattatore definito"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Completato"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Esecuzione del linter, attendere"
+msgstr "Esecuzione del formattatore, attendere"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Formattazione completata"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Input letterale"
 
@@ -2348,7 +2337,7 @@ msgstr "La Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "i numeriso traduttori e il Translation Project"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2362,27 +2351,7 @@ msgstr "e chiunque altro abbiamo dimenticato..."
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
-# FIXME
-#~ msgid "Allow generic undo [EXPERIMENTAL]"
-#~ msgstr "Abilita annullamento generico (SPERIMENTALE)"
-
-# FIXME
-#~ msgid "line wrap"
-#~ msgstr "a capo riga"
-
-#~ msgid "Find Other Bracket"
-#~ msgstr "Trova la parentesi corrispondente"
-
-#~ msgid "Long line wrapping"
-#~ msgstr "A capo automatico"
-
-# FIXME
-#~ msgid "Soft line wrapping"
-#~ msgstr "A capo morbido"
-
-#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Occorre specificare un menù a cui associare la chiave (oppure \"all\")"
-
-#~ msgid "Internal error: unknown type.  Please save your work"
-#~ msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro"
+#~ "Errore interno: corrispondenza della riga %ld non trovata. Salvare il "
+#~ "lavoro."
diff --git a/po/ja.po b/po/ja.po
index 349b686771ca4ffa3bcb9fb89d18d9ebe7bf5418..6d08a2433b878fe684fc7389f6acca45c87ce1f7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2011-07-09 09:01+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -23,8 +23,8 @@ msgid "Go To Directory"
 msgstr "ディレクトリへ移動"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "取り消しました"
 
@@ -36,7 +36,7 @@ msgstr "制限モードでは %s の外部へ移動できません"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "%s: %s の読み込みに失敗しました"
@@ -58,20 +58,20 @@ msgid "(parent dir)"
 msgstr "(parent dir)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "検索"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "先頭から検索します"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "他に見つかりません"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "検索語が指定されていません"
 
@@ -208,12 +208,12 @@ msgstr "新しいファイル"
 msgid "\"%s\" not found"
 msgstr "\"%s\" が見つかりません"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" はディレクトリです"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" はデバイスファイルです"
@@ -275,8 +275,8 @@ msgstr "バックアップファイルが多すぎませんか?"
 msgid "Error writing %s: %s"
 msgstr "%s の書き込みエラー: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "テンポラリファイルの書き込みエラー: %s"
@@ -1641,16 +1641,16 @@ msgid "Enable soft line wrapping"
 msgstr "穏やかな行の折り返しを有効にする"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano バージョン %s (コンパイル日時: %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1659,67 +1659,67 @@ msgstr ""
 "\n"
 " コンパイルオプション:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "その機能は無効です"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "変更されたバッファを保存しますか (保存しないと変更は破棄されます)？ "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "申し訳ありませんが、キーボードからの標準入力を再オープンできません。\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "標準入力から読み込んでいます。中止する場合は ^C を入力してください\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ないし SIGTERM を受信しました\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "\"fg\" とタイプすることで nano を再開できます。\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "使用する"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "使用しない"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "不明なコマンド"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON は効かないよ・・・ぶつぶつ"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF は効かないよ・・・ぶつぶつ"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "要求されたタブのサイズ \"%s\" は不正です"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "要求されたサイズ \"%s\" は不正です"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1761,8 +1761,8 @@ msgstr "エラー検出 %s の %lu 行目: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "引数 '%s' は \" で終端していません"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表現文字列は \" で括ってください"
 
@@ -1818,22 +1818,22 @@ msgstr "\"%s\" に対応する機能はありません"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "\"%s\" に対応するメニューはありません"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "申し訳ありませんが、キー \"%s\" は無効なバインディングです"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "%s: %s の読み込みに失敗しました"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1848,62 +1848,62 @@ msgstr ""
 "\"magenta\"、\"black\"で、それぞれに任意で\n"
 "接頭語\"bright\"をつけることが出来ます。"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "正規表現文字列がみつかりません"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" には対応する \"end=\" が必要です"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色 \"%s\" が明るい色ではありません"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr ""
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "致命的なエラー: \"%s\" の機能に対応するキーがありません"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1911,63 +1911,63 @@ msgstr ""
 "終了します。nanorc の設定を調整する必要がある場合は、 -I オプションを指定し"
 "て nano を使用してください。\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "\"%s\" に対応するメニューはありません"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "コマンド \"%s\" はインクルードファイル内では許可されていません"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "構文 \"%s\" は色のコマンドではありません"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "コマンド \"%s\" を解釈できません"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "色の名前がありません"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "オプション \"%s\" には引数が必要です"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "オプションが有効なマルチバイト文字ではありません"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "非空白類文字が必要です"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "\"%s\" フラグを解除できません"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知のフラグ \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "ホームディレクトリが見つかりません"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1982,57 +1982,57 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" が見つかりません"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [大文字と小文字を区別する]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [正規表現]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [戻る]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "置換候補"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu 個置換されました"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "行番号と列番号を入力"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "無効な行または列番号です"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "大括弧ではありません"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "大括弧が一致しません"
 
@@ -2048,9 +2048,9 @@ msgstr "マーク解除"
 msgid "Nothing in undo buffer!"
 msgstr "undo バッファに何もありません!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "内部エラー: 行 %d が一致しません。作業を保存してください"
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2103,22 +2103,17 @@ msgstr "やり直す操作はありません!"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "内部エラー: uncut のセットアップに失敗しました。作業を保存してください"
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "内部エラー: 行 %d が一致しません。作業を保存してください"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "操作 (%s) をやり直しました"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "pipe を作成できません"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "forkできません"
 
@@ -2144,7 +2139,7 @@ msgstr ""
 msgid "Creating misspelled word list, please wait..."
 msgstr "スペルミスのある単語リストを作成しています。しばらくお待ちください..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "pipe バッファのサイズを取得できませんでした"
 
@@ -2160,91 +2155,91 @@ msgstr "\"sort -f\" の呼び出しに失敗"
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" の呼び出しに失敗"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "スペルチェック完了"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"%s\" の呼び出しに失敗"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "スペルチェッカを起動 (利用可能な場合)"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "スペルチェック失敗: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "スペルチェック失敗: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "ファイル末尾に空行を追加しない"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "このメッセージを表示"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "このメッセージを表示"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s単語数: %lu  行数: %ld  文字数: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "選択範囲内:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "逐次入力"
 
diff --git a/po/ms.po b/po/ms.po
index bb6cbc2a38b75bfa624af447260be9de4274ba1e..950e9171053dc0eb4aea3c390a5be16e5518954d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2009-01-06 00:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -37,7 +37,7 @@ msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr "(dir induk)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya inilah sahaja yang dijumpai"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
@@ -203,12 +203,12 @@ msgstr "Fail Baru"
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
@@ -268,8 +268,8 @@ msgstr "Terlalu banyak fail salinan?"
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
@@ -1648,16 +1648,16 @@ msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano versi %s (compiled %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Emel: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1666,68 +1666,68 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, sokongan untuk fungsi ini telah dimatikan"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Arahan Tidak Diketahui"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1769,8 +1769,8 @@ msgstr "Ralat dalam %s pada baris %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
@@ -1824,22 +1824,22 @@ msgstr "Tidak dapat memetakan nama \"%s\" ke fungsi\n"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Maaf, kekunci \"%s\" adalah ikatan tidak sah\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1854,66 +1854,66 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Rentetan regex hilang"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Rentetan regex hilang"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Ralat maut: tiada kekunci dipetakan untuk fungsi \"%s\""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1921,63 +1921,63 @@ msgstr ""
 "Keluar. Sila guna nano dengan pilihan -I jika perlu untuk mengubah tetapan "
 "nanorc anda\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat nyahtetap penanda \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Penanda \"%s\" tidak diketahui"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1992,57 +1992,57 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" tidak dijumpai"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitif]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Undur]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (untuk mengganti) dalam pilihan"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (untuk mengganti)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti dikedudukan ini?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu tempat telah diganti"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Masukkan nombor baris, nombor lajur"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan kurungan"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
@@ -2058,9 +2058,9 @@ msgstr "Nyahtetap Tanda"
 msgid "Nothing in undo buffer!"
 msgstr "Tiada apa dalam buffer nyahbuat!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2114,22 +2114,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Ralat dalaman: tidak dapat menetapkan nyahpotong. Sila simpan kerja anda."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
@@ -2156,7 +2151,7 @@ msgstr "Ubah penggantian"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
@@ -2172,91 +2167,91 @@ msgstr "Ralat melaksanakan \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Jangan tambah baris baru pada penghujung fail"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Papar mesej ini"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Papar mesej ini"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Masukan Verbatim"
 
diff --git a/po/nano.pot b/po/nano.pot
index 717eb02567c1185333fa63bf6755e6da6a84b94c..5c6f0b86157badf88ca39d59cdb68ceb82da2c44 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr ""
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgstr ""
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr ""
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr ""
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr ""
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
@@ -211,12 +211,12 @@ msgstr ""
 msgid "\"%s\" not found"
 msgstr ""
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
@@ -276,8 +276,8 @@ msgstr ""
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -1496,82 +1496,82 @@ msgstr ""
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+msgid " GNU nano, version %s\n"
 msgstr ""
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1613,8 +1613,8 @@ msgstr ""
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
@@ -1666,22 +1666,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1691,122 +1691,122 @@ msgid ""
 "for foreground colors."
 msgstr ""
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr ""
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr ""
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1819,38 +1819,38 @@ msgid "\"%.*s%s\" not found"
 msgstr ""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr ""
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr ""
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr ""
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr ""
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1858,19 +1858,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr ""
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr ""
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr ""
 
@@ -1886,9 +1886,9 @@ msgstr ""
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -1940,22 +1940,17 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr ""
 
@@ -1980,7 +1975,7 @@ msgstr ""
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
@@ -1996,87 +1991,87 @@ msgstr ""
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr ""
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr ""
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index d96ae0d4ef5c56d01ec201114a19979ddebee405..991566345cbb7dec99ab2c9e3d9d98f80feec2e5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-07-18 20:37+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -27,8 +27,8 @@ msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -40,7 +40,7 @@ msgstr "Kan ikke gå utenfor %s i begrenset modus"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Lesefeil på %s: %s"
@@ -62,20 +62,20 @@ msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søk"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søket gikk rundt"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er eneste forekomst"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Tomt søkemønster"
 
@@ -222,13 +222,13 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "«%s» ikke funnet"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» er en katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» er en enhetsfil (device)"
@@ -290,8 +290,8 @@ msgstr "For mange sikkerhetskopier?"
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
@@ -1645,16 +1645,16 @@ msgid "Enable soft line wrapping"
 msgstr "Aktiver myk linjebryting"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1663,67 +1663,67 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Beklager, støtte for denne funksjonen er deaktivert"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Ingen filnavn"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagre endret buffer («NEI» VIL ØDELEGGE ENDRINGENR) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Leser fra standard inn, ^C for å avbryte\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Bruk «fg» for å returnere til nano\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukjent kommando"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorert, mumle mumle."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorert, mumle mumle."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angitt tabulatorstørrelse «%s» er ugyldig"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Foreslått fyllbredde «%s» er ugyldig"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Skriv «%s -»' for en liste over tilgjengelige alternativer.\n"
@@ -1765,8 +1765,8 @@ msgstr "Feil i %s på linje %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strenger med reg-uttrykk må begynne med et \"-tegn"
 
@@ -1818,22 +1818,22 @@ msgstr "Kunne ikke tilordne navn «%s» til en funksjon"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funksjon «%s» eksisterer ikke i meny «%s»"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, tastekombinasjonen «%s» kan ikke rebindes"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Feil ved utviding %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1849,63 +1849,63 @@ msgstr ""
 "(sort), med valgfritt prefiks «bright» (lys)\n"
 "på forgrunnsfarver."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Regulært uttrykk mangler"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» forutsetter et korresponderende «end=»"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Bakgrunnsfargen %s kan ikke være lys"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Kan ikke legge til en magisk regulær-streng uten syntakskommando"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Mangler magisk strengnavn"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Kan ikke legge til linter uten en syntakskommando"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Kan ikke legge til linter uten en syntakskommando"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal feil: ingen taster kartlagt for funksjon «%s», avslutter.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1913,62 +1913,62 @@ msgstr ""
 "Hvis nødvendig, bruk nano med -I alternativ for å justere nanorc-"
 "innstillinger.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunne ikke finne syntax «%s» å forlenge"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Mangler flagg"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Brukervalget er ikke gyldig for flerbyte strenger"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "MÃ¥ ha tegn som ikke er tabulator eller mellomslag"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke tilbakestille flagg «%s»"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Ukjent flagg «%s»"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1983,38 +1983,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» ikke funnet"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Ta hensyn til store/små bokstaver]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regulært uttrykk]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (Ã¥ erstatte) i seksjon"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (Ã¥ erstatte)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2022,19 +2022,19 @@ msgstr[0] "Erstattet %lu tilfelle"
 msgstr[1] "Erstattet %lu tilfeller"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer, kolonnenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
@@ -2050,10 +2050,10 @@ msgstr "Fjern merke"
 msgid "Nothing in undo buffer!"
 msgstr "Ingenting i angrebuffer!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "Intern feil: kan ikke matche linje %ld. Vennligst lagre arbeidet ditt"
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2105,22 +2105,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Intern feil: kan ikke sette opp Gjør om. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Kunne ikke opprette pipe"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
@@ -2147,7 +2142,7 @@ msgstr "Rediger erstatning"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kunne ikke finne størrelse på pipe buffer"
 
@@ -2163,88 +2158,88 @@ msgstr "Feil ved start av zsort -f»"
 msgid "Error invoking \"uniq\""
 msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil ved start av «%s»"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavesjekk, vennligst vent"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Ingen linter definert for denne filtypen!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Lagre endret buffer før linting?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Starter linter, vennligst vent"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fikk 0 maskinlesbare linjer fra kommando: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Denne meldingen er for uåpnet fil %s, åpne den i en ny buffer?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Ved siste melding"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Ved første melding"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Starter linter, vennligst vent"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Legg inn ord for ord"
 
@@ -2322,6 +2317,10 @@ msgstr "og alle de andre vi glemte..."
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Intern feil: kan ikke matche linje %ld. Vennligst lagre arbeidet ditt"
+
 #~ msgid "line wrap"
 #~ msgstr "linjebryting"
 
diff --git a/po/nl.po b/po/nl.po
index 4944a45a9ad7d1697ba714b954554eedc23b719a..31aaca463b849180ad1bcc8d7b220c253ac81e9e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,19 +1,21 @@
 # Dutch translations for GNU nano.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# “Sorrow never stays punishment.”
+# "Roses are red, violets are blue,
+# #NSA loves privacy rights and
+# absolutely everything about you."
 #
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014.
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015.
 # 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-2.3.5\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-13 17:34+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:06+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -29,8 +31,8 @@ msgid "Go To Directory"
 msgstr "Naar map"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
@@ -42,7 +44,7 @@ msgstr "Kan in beperkte modus niet buiten %s gaan"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout tijdens lezen van %s: %s"
@@ -64,20 +66,20 @@ msgid "(parent dir)"
 msgstr "(oudermap)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Rondgelopen"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dit is de enige overeenkomst"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
@@ -117,7 +119,7 @@ msgstr ""
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Bestand %s wordt al bewerkt (door %s met %s, PID %d); doorgaan?"
 
 #: src/files.c:308
 #, c-format
@@ -231,12 +233,12 @@ msgstr "Nieuw bestand"
 msgid "\"%s\" not found"
 msgstr "'%s' is niet gevonden"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
@@ -296,8 +298,8 @@ msgstr "Te veel reservekopieën?"
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
@@ -478,7 +480,7 @@ msgstr "huidige functie annuleren"
 
 #: src/global.c:510
 msgid "Display this help text"
-msgstr "deze hulptekst tonen"
+msgstr "deze hulptekst tonen en stoppen"
 
 #: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
@@ -526,7 +528,7 @@ msgstr "huidige cursorpositie tonen"
 
 #: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "spellingscontrole oproepen (indien beschikbaar)"
+msgstr "spellingscontrole aanroepen (indien beschikbaar)"
 
 #: src/global.c:538
 msgid "Replace a string or a regular expression"
@@ -750,7 +752,7 @@ msgstr "naar een op te geven map gaan"
 
 #: src/global.c:639
 msgid "Invoke the linter, if available"
-msgstr "een linter oproepen (syntaxcontrole, indien beschikbaar)"
+msgstr "een linter aanroepen (syntaxcontrole, indien beschikbaar)"
 
 #: src/global.c:640
 msgid "Go to previous linter msg"
@@ -761,9 +763,8 @@ msgid "Go to next linter msg"
 msgstr "naar de volgende lintermelding springen"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "een linter oproepen (syntaxcontrole, indien beschikbaar)"
+msgstr "een opmaakprogramma aanroepen (indien beschikbaar)"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -799,9 +800,8 @@ msgid "To Linter"
 msgstr "Linter"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "DOS-indeling"
+msgstr "Opmaker"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1571,7 +1571,7 @@ msgstr "Backspace/Delete-verwarring oplossen"
 
 #: src/nano.c:915
 msgid "Show this help text"
-msgstr "deze hulptekst tonen"
+msgstr "deze hulptekst tonen en stoppen"
 
 #: src/nano.c:918
 msgid "Automatically indent new lines"
@@ -1663,17 +1663,17 @@ msgstr "rest van te lange regels tonen op volgende"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versie %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " E-mail: <nano@nano-editor.org>  Website: http://www.nano-editor.org/\n"
 " Meld fouten in de vertaling aan <vertaling@vrijschrift.org>."
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1682,68 +1682,68 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Ondersteuning voor deze functie is uitgeschakeld"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Geen bestandsnaam"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lezen van standaardinvoer; ^C om af te breken\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr " (aangezet)"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Onbekend commando"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON genegeerd; mmm-mmm"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF genegeerd; mmm-mmm"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Typ '%s -h' voor een lijst van beschikbare opties.\n"
@@ -1786,8 +1786,8 @@ msgstr "Fout in %s op regel %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
@@ -1840,22 +1840,22 @@ msgstr "Kan in naam '%s' geen functie herkennen"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan in naam '%s' geen menu herkennen"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Functie '%s' bestaat niet in menu '%s'"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Toets '%s' mag niet herbonden worden"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fout bij expanderen van %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1869,127 +1869,125 @@ msgstr ""
 "'magenta', 'yellow', 'cyan', 'black' en 'white',\n"
 "met voor voorgrondkleuren het optionele voorvoegsel 'bright'."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Ontbrekende reg.exp.-tekenreeks"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Kan geen reguliere expressie voor magische tekenreeks toevoegen zonder een "
 "'syntax'-commando"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Ontbrekende naam van magische tekenreeks"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Ontbrekend commando bij 'linter'"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
+msgstr "Kan geen opmaker toevoegen zonder een 'syntax'-commando"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Ontbrekend commando bij 'linter'"
+msgstr "Ontbrekend commando bij 'formatter'"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatale fout: aan functie '%s' is geen toets gebonden.  Gestopt.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, 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:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
 # FIXME: option *argument* is meant
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Argument is geen geldige multibyte-tekenreeks"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan optie '%s' niet uitzetten"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Onbekende optie '%s'"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2004,38 +2002,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' niet gevonden"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Hoofdlettergevoelig]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Reg.exp.]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Achterwaarts]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (om te vervangen) in selectie"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (om te vervangen)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Deze overeenkomst vervangen?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Vervangen door"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2043,19 +2041,19 @@ msgstr[0] "%lu overeenkomst vervangen"
 msgstr[1] "%lu overeenkomsten vervangen"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Geef regelnummer, kolomnummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Is geen haakje"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
@@ -2071,10 +2069,11 @@ msgstr "Uitgezet"
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
-#: src/text.c:445
+# FIXME: make identical to other -- %ld
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "*Interne fout*: kan regel %ld niet vinden.  Sla uw werk op."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2098,7 +2097,7 @@ msgstr "tekstterugplaatsing"
 
 #: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "regeleinde"
+msgstr "regelafbreking"
 
 #: src/text.c:528 src/text.c:672
 msgid "text insert"
@@ -2125,23 +2124,17 @@ msgstr "Er is niets om opnieuw te doen"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "*Interne fout*: kan herdoening niet voorbereiden.  Sla uw werk op."
 
-# FIXME: make identical to other -- %ld
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bewerking (%s) is opnieuw gedaan"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
@@ -2164,9 +2157,9 @@ msgstr "Vervanging bewerken"
 
 #: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Aanmaken van lijst van verkeerd gespelde woorden, even geduld..."
+msgstr "Aanmaken van lijst van verkeerd gespelde woorden; even geduld..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
@@ -2182,88 +2175,87 @@ msgstr "Fout bij aanroepen van 'sort -f'"
 msgid "Error invoking \"uniq\""
 msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fout bij aanroepen van '%s'"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
-msgstr "Oproepen van spellingscontrole, even geduld"
+msgstr "Aanroepen van spellingscontrole; even geduld..."
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Er is geen linter gedefinieerd voor dit type bestand"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Gewijzigd buffer opslaan alvorens te linten?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
-msgstr "Oproepen van de linter, even geduld"
+msgstr "Aanroepen van de linter; even geduld..."
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Deze melding is voor ongeopend bestand %s; in nieuwe buffer openen?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Dit is de laatste melding"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Dit is de eerste melding"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fout: geen 'formatter' gedefinieerd"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Klaar"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Oproepen van de linter, even geduld"
+msgstr "Aanroepen van de opmaker; even geduld..."
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Het opmaken is klaar"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Verbatim invoer"
 
@@ -2328,7 +2320,7 @@ msgstr "de Free Software Foundation"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "de vele vertalers en de TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2342,6 +2334,12 @@ msgstr "en iedereen die we vergeten zijn..."
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "*Interne fout*: kan regel %ld niet vinden.  Sla uw werk op."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+
 #~ msgid "line wrap"
 #~ msgstr "regelterugloop"
 
@@ -2374,12 +2372,6 @@ msgstr "Dank u voor het gebruiken van nano!"
 #~ msgid "Missing flag"
 #~ msgstr "Ontbrekende vlag"
 
-#~ msgid "Internal error: unknown type.  Please save your work"
-#~ msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
-
-#~ msgid "Internal error: Redo setup failed.  Please save your work"
-#~ msgstr "*Interne fout*: kan herdoening niet voorbereiden.  Sla uw werk op."
-
 #~ msgid "Could not pipe"
 #~ msgstr "Kan niet doorsluizen"
 
diff --git a/po/nn.po b/po/nn.po
index 8791ad256fd296043cb58ff731a0f88bd47fccdc..94b1baee4e1dd9af1aced67d480b5913a6351455 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2002-03-22 20:34+0100\n"
 "Last-Translator: Kjetil Torgrim Homme <kjetilho@linpro.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Gå til katalog"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrote"
 
@@ -37,7 +37,7 @@ msgstr "Kan ikkje g
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søk"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søket gjekk rundt"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er einaste forekomst"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
@@ -212,13 +212,13 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "«%s» ikkje funne"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "Fila «%s» er ein katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila «%s» er ikkje ei vanleg fil"
@@ -282,8 +282,8 @@ msgstr ""
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -1704,16 +1704,16 @@ msgid "Enable soft line wrapping"
 msgstr ""
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tVev: http://www.nano-editor.org"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1722,69 +1722,69 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 #, fuzzy
 msgid "No file name"
 msgstr "filnamnet er %s"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1826,8 +1826,8 @@ msgstr "Feil i %s p
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk må starte og slutte med eit \"-teikn\n"
@@ -1882,22 +1882,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1911,128 +1911,128 @@ msgstr ""
 "«white» (kvit), «yellow» (gul), «cyan» (lysblå), «magenta» (fiolett) og\n"
 "«black» (svart), med den valfrie nemninga «bright» (lys) først.\n"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar «start=» må der vera ein «end=»"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forståeleg"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan ikkje endra storleik på toppvindauget"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2047,39 +2047,39 @@ msgid "\"%.*s%s\" not found"
 msgstr "«%s» ikkje funne"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Skil store/små]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Reguttrykk]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (å erstatta)"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (å erstatta)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatta dette tilfellet?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:993
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2087,20 +2087,20 @@ msgstr[0] "Erstatta %d tilfelle"
 msgstr[1] "Erstatta %d tilfelle"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
@@ -2117,9 +2117,9 @@ msgstr "Merke fjerna"
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2174,23 +2174,18 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 #, fuzzy
 msgid "Could not create pipe"
 msgstr "Kunne ikkje oppretta mellombels fil: %s"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
@@ -2216,7 +2211,7 @@ msgstr "Rediger erstatning"
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
@@ -2232,90 +2227,89 @@ msgstr ""
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s på linje %d: "
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr ""
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr ""
 
-#: src/text.c:3255
-#, fuzzy
-msgid "Error: no linter defined"
-msgstr "Feil i %s på linje %d: "
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3446
+#: src/text.c:3439
 #, 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:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 382a6915a02c1d21b41d166adb8200f90f858d05..c54002cd775916456a8d07a3c2b97a27ec8b1302 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-09-02 08:57+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -26,8 +26,8 @@ msgid "Go To Directory"
 msgstr "Przejd¼ do katalogu"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Anulowano"
 
@@ -39,7 +39,7 @@ msgstr "W trybie ograniczonym nie mo
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "B³±d odczytu %s: %s"
@@ -61,20 +61,20 @@ msgid "(parent dir)"
 msgstr "(kat nad)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Wyszukiwanie minê³o granicê pliku - kontynuowane od pocz±tku (koñca)"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "To jedyne wyst±pienie"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
@@ -239,12 +239,12 @@ msgstr "Nowy plik"
 msgid "\"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" jest plikiem urz±dzenia"
@@ -308,8 +308,8 @@ msgstr "Za wiele kopii zapasowych?"
 msgid "Error writing %s: %s"
 msgstr "B³±d zapisu %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "B³±d zapisu pliku tymczasowego: %s"
@@ -1670,16 +1670,16 @@ msgid "Enable soft line wrapping"
 msgstr "W³±cza miêkkie przewijanie linii"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano wersja %s (skompilowana %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1688,69 +1688,69 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Przepraszamy, obs³uga tej funkcji zosta³a wy³±czona"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Brak nazwy pliku"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Zapisaæ zmieniony bufor (ODPOWIED¬ \"Nie\" SPOWODUJE UTRATÊ ZMIAN) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Nie uda³o siê ponownie otworzyæ wej¶cie standardowe z klawiatury, "
 "przepraszamy\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Odczyt z wej¶cia standardowego. Aby przerwaæ, naci¶nij ^C\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Aby powróciæ do nano, u¿yj \"fg\".\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "w³±czony(e)"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "wy³±czony(e)"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Nieznane polecenie"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Zignorowano XON, hmm, hmm."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Zignorowano XOFF, hmm, hmm."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "¯±dana wielko¶æ tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "¯±dana pozycja ³amania linii \"%s\" nie jest poprawna"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Podaj '%s -h' aby uzyskaæ listê dostêpnych opcji.\n"
@@ -1792,8 +1792,8 @@ msgstr "B
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument %s ma niedomkniêty \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Wyra¿enia regularne musz± zaczynaæ siê i koñczyæ znakiem \""
 
@@ -1845,22 +1845,22 @@ msgstr "Nie mo
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nie mo¿na odwzorowaæ nazwy \"%s\" na menu"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Brak funkcji '%s' w menu '%s'"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Przepraszam, przyci¶niêcie \"%s\" nie mo¿e byæ przypisane ponownie"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "B³±d rozszerzenia %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1875,126 +1875,126 @@ msgstr ""
 "\"black\", z opcjonalnym przedrostkiem \"bright\"\n"
 "dla kolorów pierwszoplanowych."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nie mo¿na dodaæ polecenia koloru bez polecenia sk³adni"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Brak wyra¿enia regularnego"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" wymaga odpowiadaj±cego mu \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Nie mo¿na dodaæ wyra¿enia regularnego bez polecenia sk³adni"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Brak nazwy ³añcucha magicznego"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Nie mo¿na dodaæ analizatora sk³adni bez polecenia sk³adni"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Brak nazwy analizatora sk³adni"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Nie mo¿na dodaæ analizatora sk³adni bez polecenia sk³adni"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Brak nazwy analizatora sk³adni"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "B³±d krytyczny: brak przypisanego klawisza dla funkcji \"%s\".  "
 "Zakoñczenie.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, 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:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Nie znaleziono sk³adni \"%s\" do rozszerzenia"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku do³±czonym"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sk³adnia \"%s\" nie ma ustawieñ kolorów"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Niezrozumia³e polecenie \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Brak opcji"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opcja nie jest poprawnym ³añcuchem wielobajtowym"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Wymagane s± nie-bia³e znaki"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Wymagane s± dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Nie mo¿na zresetowaæ opcji \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Nieznana opcja \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nie mogê znale¼æ swojego katalogu domowego!  Aj!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2009,38 +2009,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "Nie znaleziono \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Uwzgl.wielk.liter]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Wyr.reg.]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Wstecz]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (i zast±p) w zaznaczeniu"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (i zast±p)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Czy zast±piæ to wyst±pienie?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Zast±p przez"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2049,19 +2049,19 @@ msgstr[1] "Zast
 msgstr[2] "Zast±piono %lu wyst±pieñ"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Wprowad¼ numer linii, numer kolumny"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "To nie nawias"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
@@ -2077,11 +2077,11 @@ msgstr "Znacznik skasowany"
 msgid "Nothing in undo buffer!"
 msgstr "Nie ma nic w buforze odwo³ania"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %ld. Proszê zapisaæ swoj± pracê."
+"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %d. Proszê zapisaæ swoj± pracê."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2134,23 +2134,17 @@ msgstr ""
 "B³±d wewnêtrzny: ustawianie powtórzenia nie powiod³o siê. Proszê zapisaæ "
 "swoj± pracê."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %d. Proszê zapisaæ swoj± pracê."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Powtórzono operacjê (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Nie mo¿na utworzyæ potoku"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nie mo¿na rozwidliæ procesu"
 
@@ -2177,7 +2171,7 @@ msgstr "Edytuj zast
 msgid "Creating misspelled word list, please wait..."
 msgstr "Tworzenie listy b³êdnie napisanych s³ów, proszê czekaæ..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nie mo¿na uzyskaæ wielko¶ci bufora potoku"
 
@@ -2193,89 +2187,89 @@ msgstr "B
 msgid "Error invoking \"uniq\""
 msgstr "B³±d podczas wywo³ywania \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zakoñczono sprawdzanie pisowni"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "B³±d podczas wywo³ywania \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Wywo³anie sprawdzania pisowni, proszê zaczekaæ"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Brak analizatora sk³adni dla tego typu pliku!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Zapisaæ bufor przed sprawdzaniem sk³adni?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Sprawdzanie sk³adni, proszê zaczekaæ"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Otrzymano 0 poprawnych linii od polecenia: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ten komunikat dotyczy nie otworzonego pliku %s; otworzyæ go w nowym buforze?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Ostatni komunikat"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Pierwszy komunikat"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Sprawdzanie sk³adni, proszê zaczekaæ"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sS³owa: %lu  Linii: %ld  Znaki: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "wprowadzanie dos³owne"
 
@@ -2353,5 +2347,10 @@ msgstr "oraz wszyscy pozostali, o kt
 msgid "Thank you for using nano!"
 msgstr "Dziêkujemy za korzystanie z nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %ld. Proszê zapisaæ swoj± "
+#~ "pracê."
+
 #~ msgid "line wrap"
 #~ msgstr "przewijanie linii"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 53d74aa3834d6e811ccf899914845f45472abfd8..52ca8d58863d90e0aaef335a9388eb8aa39a6c14 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,15 +1,15 @@
 # Brazilian Portuguese translation for the nano
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # João Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2010.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-15 21:31-0300\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-02-27 17:36-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
 "net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 1.7.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: This is a prompt.
@@ -26,8 +26,8 @@ msgid "Go To Directory"
 msgstr "Ir para o diretório"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -39,7 +39,7 @@ msgstr "Não é possível mover-se para fora de %s no modo restrito"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro ao ler %s: %s"
@@ -61,20 +61,20 @@ msgid "(parent dir)"
 msgstr "(dir acima)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Pesquisa"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pesquisa ajustada"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Esta é a única ocorrência"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nenhum padrão de pesquisa atualmente"
 
@@ -113,7 +113,7 @@ msgstr "Erro ao ler o arquivo de trava %s: Leitura de dados insuficiente"
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Arquivo %s está sendo editado (por %s com %s, PID %d). Continuar?"
 
 #: src/files.c:308
 #, c-format
@@ -227,12 +227,12 @@ msgstr "Novo arquivo"
 msgid "\"%s\" not found"
 msgstr "\"%s\" não encontrado"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é um diretório"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é um arquivo dispositivo"
@@ -295,8 +295,8 @@ msgstr "Muitos arquivos reserva?"
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
@@ -761,9 +761,8 @@ msgid "Go to next linter msg"
 msgstr "Vai para a próxima mensagem do lintador"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Chama o lintador, se disponível"
+msgstr "Chama o formatador, se disponível"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -799,9 +798,8 @@ msgid "To Linter"
 msgstr "Lintar"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Formato DOS"
+msgstr "Formatador"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1668,16 +1666,16 @@ msgid "Enable soft line wrapping"
 msgstr "Habilita ajuste suave de linhas compridas"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versão %s (compilado %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1686,68 +1684,68 @@ msgstr ""
 "\n"
 " Opções compiladas:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desculpe, suporte para esta função foi desabilitado"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Nenhum nome de arquivo"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvar o buffer modificado (RESPONDER \"Não\" IRÁ DESTRUIR MODIFICAÇÕES) ?"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 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:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilize \"fg\" para retornar ao nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando desconhecido"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorado, mumble mumble."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorado, mumble mumble"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Digite \"%s -h\" para uma lista de opções disponíveis.\n"
@@ -1789,8 +1787,8 @@ msgstr "Erro no %s na linha %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expressão regular deve começar e terminar com um caractere \""
 
@@ -1843,22 +1841,22 @@ msgstr "Não foi possível mapear o nome \"%s\" a uma função"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Não foi possível mapear o nome \"%s\" a um menu"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Desculpe, a sequência \"%s\" ter seu vínculo redefinido"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Erro ao expandir %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1873,67 +1871,65 @@ msgstr ""
 "\"magente\" (magenta) e \"black\" (preto), com o prefixo \n"
 "opcional \"bright\" (claro) para cores de primeiro plano."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "não é possível adicionar um comando de cor sem um comando de sintaxe"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta a expressão regular"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa de um \"end=\" correspondente"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Não é possível adicionar uma expressão regular de cabeçalho sem um comando "
 "de sintaxe"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Não é possível adicionar uma expressão regular de string mágica sem um "
 "comando de sintaxe"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Falta o nome de string mágica"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Não é possível adicionar um lintador sem um comando de sintaxe"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Falta o comando de lintador"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Não é possível adicionar um lintador sem um comando de sintaxe"
+msgstr "Não é possível adicionar formatador sem um comando de sintaxe"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Falta o comando de lintador"
+msgstr "Falta o comando de formatador"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\". Saindo.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1941,63 +1937,63 @@ msgstr ""
 "Se necessário, use nano com a opção -I para ajustar suas configurações no "
 "nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Não foi possível localizar a sintaxe \"%s\" para estender"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" não é permitido no arquivo incluído"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Falta opção"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opção não é uma string multibyte válida"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
 # Tradução para single-column?
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dois caracteres de coluna única são necessários"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Não é possível desativar a opção \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Opção \"%s\" desconhecida"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Não consigo localizar o meu diretório pessoal! Putz!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2012,38 +2008,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" não encontrado"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Sensibilidade de caixa]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Expressão regular]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Retroceder]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (para substituir) na seleção"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (para substituir) na seleção"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Substituir esse termo?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Substituir por"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2051,19 +2047,19 @@ msgstr[0] "Substituiu-se %lu ocorrência"
 msgstr[1] "Substituiu-se %lu ocorrências"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Insira o número da linha, número da coluna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Não é um parênteses"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Nenhum parênteses encontrado"
 
@@ -2080,12 +2076,11 @@ msgstr "Marcação desativada"
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Erro interno: não consegui casar a linha %ld:  Por favor salve o seu "
-"trabalho."
+"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2138,23 +2133,17 @@ msgstr ""
 "Erro interno: não consegui configurar refazimento.  Por favor salve o seu "
 "trabalho."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ação repetida (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Impossível criar o duto"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Não foi possível bifurcar"
 
@@ -2181,7 +2170,7 @@ msgstr "Editar uma substituição"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Não foi possível descobrir o tamanho do buffer do duto"
 
@@ -2197,89 +2186,89 @@ msgstr "Erro ao chamar o \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Erro ao chamar o \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Verificação ortográfica finalizada"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ao chamar o \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Chamar pelo verificador ortográfico, se disponível"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificação ortográfica falhou: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Nenhum lintador definido para este tipo de arquivo!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Salvar o buffer modificado antes de lintar?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Chamando lintador, por favor espere"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Obteve 0 linhas analisáveis a partir do comando: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Essa mensagem é para o arquivo não-aberto %s, abri-lo em um novo buffer?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Na última mensagem"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Na primeira mensagem"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Erro: nenhum lintador definido"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Finalizado"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Chamando lintador, por favor espere"
+msgstr "Chamando formatador, por favor espere"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Formatação finalizada"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
@@ -2344,7 +2333,7 @@ msgstr "A Fundação Software Livre"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "os vários tradutores e o TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2358,6 +2347,11 @@ msgstr "e qualquer outro que nós esquecemos..."
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erro interno: não consegui casar a linha %ld:  Por favor salve o seu "
+#~ "trabalho."
+
 #~ msgid "line wrap"
 #~ msgstr "quebra de linha"
 
diff --git a/po/ro.po b/po/ro.po
index 418c3b051ec6a5d1e970443a607de97ca91ad1a8..8a7acb4ef33f4a79c2c86cd7d8ff3ec4721719eb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,49 +1,55 @@
-# Mesajele în limba românã pentru nano.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul nano.
+# Translation of the nano editor to Romanian.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+# Laurențiu Buzdugan <lbuz@rolix.org>, 2003-2005.
+# Mihai Cristescu <mihai.cristescu@archlinux.info>, 2015.
 #
-# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004, 2005.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.3.7\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2005-04-18 07:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:02+0200\n"
+"Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+"X-Generator: Poedit 1.7.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: src\n"
 
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Mergi la Director"
+msgstr "Mergi la director"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "Am renunþat"
+msgstr "S-a renunțat"
 
 #: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Nu pot merge în afara %s în modul restricþionat"
+msgstr "Nu pot merge în afara %s în modul restricționat"
 
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Eroare citind %s: %s"
+msgstr "Eroare la citirea %s: %s"
 
 #: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Nu pot schimba în sus un director"
+msgstr "Nu se poate schimba mai sus directorul"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
@@ -55,219 +61,249 @@ msgstr "(dir)"
 #. * characters.
 #: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(dir sup.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Cautã"
+msgstr "Caută"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Cãutare de la început"
+msgstr "Caută de la început"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Aceasta este singura apariþie"
+msgstr "Aceasta este singura apariție"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Nici un pattern de cãutare curent"
+msgstr "Nici un termen de căutare definit"
 
 #: src/files.c:139
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
+"Nu s-a putut determina identitatea mea pentru fișierul blocat - getpwuid() a "
+"eșuat"
 
 #: src/files.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine hostname for lock file: %s"
-msgstr "Nu am putut crea fiºier temporar: %s"
+msgstr "Nu s-a putut determina numele gazdei pentru fișierul blocat: %s"
 
 #: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la scrierea fișierului de blocare %s: %s"
 
 #: src/files.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la ștergerea fișierului de blocare %s: %s"
 
 #: src/files.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "Eroare citind %s: %s"
+msgstr "Eroare la deschiderea fișierului de blocare %s: %s"
 
 #: src/files.c:282
 #, c-format
 msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Eroare la citirea fișierului de blocare %s: Nu s-au citit suficiente date"
 
 #. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
+"Fișierul %s este în curs de editare (de %s cu %s, PID %d); Se continuă?"
 
 #: src/files.c:308
 #, c-format
 msgid "Error writing lock file: Directory '%s' doesn't exist"
-msgstr ""
+msgstr "Eroare la scrierea fișierului de blocare: Directorul „%s” nu există"
 
 #: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Nu pot insera fiºier din afara lui %s"
+msgstr "Nu se poate insera un fișier din afara %s"
 
 #: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Nici un alt bufere deschis"
+msgstr "Nu mai sunt fișiere deschise"
 
 #: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Am schimbat la %s"
+msgstr "S-a schimbat la %s"
 
 #: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Bufer nou"
+msgstr "Spațiu nou"
 
 #: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS ºi Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS ºi Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul DOS și Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul DOS și Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul DOS și Mac)"
 
 #: src/files.c:879
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS ºi Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS ºi Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS și Mac - Avertizare: "
+"fără permisiune la scriere)"
 
 #: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul Mac)"
 
 #: src/files.c:889
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
 
 #: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] "S-a citit %lu linie (convertită din formatul DOS)"
+msgstr[1] "S-au citit %lu linii (convertite din formatul DOS)"
+msgstr[2] "S-au citit %lu de linii (convertite din formatul DOS)"
 
 #: src/files.c:899
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
 
 #: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Am citit %lu linie"
-msgstr[1] "Am citit %lu linii"
+msgstr[0] "S-a citit %lu linie"
+msgstr[1] "S-au citit %lu linii"
+msgstr[2] "S-au citit %lu de linii"
 
 #: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S-a citit %lu linie (Avertizare: fără permisiune la scriere)"
+msgstr[1] "S-au citit %lu linii (Avertizare: fără permisiune la scriere)"
+msgstr[2] "S-au citit %lu de linii (Avertizare: fără permisiune la scriere)"
 
 #: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Citesc Fiºier"
+msgstr "Se citește fișierul"
 
 #: src/files.c:950
 msgid "New File"
-msgstr "Fiºier nou"
+msgstr "Fișier nou"
 
 #: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" nu a fost gãsit"
+msgstr "„%s” nu a fost găsit"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" este un director"
+msgstr "„%s” este un director"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Fiºierul \"%s\" este un fiºier dispozitiv (device)"
+msgstr "„%s” este un fișier dispozitiv"
 
 #: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Comandã de executat în bufer nou [din %s] "
+msgstr "Comandă de executat într-un spațiu nou [din %s] "
 
 #: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Comandã de executat [din %s] "
+msgstr "Comandă de executat [din %s] "
 
 #: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fiºier de inserat în bufer nou [din %s]"
+msgstr "Fișier de inserat într-un spațiu nou [din %s] "
 
 #: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fiºier de inserat [din %s]"
+msgstr "Fișier de inserat [din %s]"
 
 #: src/files.c:1320
-#, fuzzy
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tastã ilegalã în modul non-multibufer"
+msgstr "Tastă ilegală în afara modului multi-spațiu"
 
 #: src/files.c:1622
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
+"Eșec la scrierea copiei de rezervă, se continuă salvarea? (Tastați N dacă "
+"sunteți nesigur) "
 
 #: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Nu pot scrie în afarã de %s"
+msgstr "Nu se poate scrie în afara %s"
 
 #: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Nu pot pre-adãugã sau adãuga la un symlink cu setarea --nofollow"
+msgstr "Imposibil de adăugat la o legătură simbolică cu setarea --nofollow"
 
 #: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
 #: src/files.c:1910 src/files.c:1939
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la scrierea copiei de rezervă %s: %s"
 
 #: src/files.c:1844 src/nano.c:719
-#, fuzzy
 msgid "Too many backup files?"
-msgstr "Fiºiere copie de siguranþã (backup)"
+msgstr "Prea multe copii de rezervă?"
 
 #: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
 #: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
@@ -275,20 +311,21 @@ msgstr "Fi
 #: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Eroare scriind %s: %s"
+msgstr "Eroare la scrierea %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la scrierea fișierului temporar: %s"
 
 #: src/files.c:2173
-#, fuzzy, c-format
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Am scris %u linie"
-msgstr[1] "Am scris %u linii"
+msgstr[0] "S-a scris %lu linie"
+msgstr[1] "S-au scris %lu linii"
+msgstr[2] "S-au scris %lu de linii"
 
 #: src/files.c:2278
 msgid " [DOS Format]"
@@ -300,56 +337,57 @@ msgstr " [Format Mac]"
 
 #: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Copie de siguranþã (backup)]"
+msgstr " [Copie de rezervă]"
 
 #: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Pre-adaugã Selecþie la fiºier"
+msgstr "Adaugă selecție la începutul fișierului"
 
 #: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Adaugã Selecþie la fiºier"
+msgstr "Adaugă selecție la fișier"
 
 #: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Scrie Selecþie în fiºier"
+msgstr "Scrie selecție în fișier"
 
 #: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Nume de pre-adãugat la"
+msgstr "Numele fișierului la începutul căruia se adaugă"
 
 #: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Nume de adãugat la"
+msgstr "Numele fișierului la sfârșitul căruia se adaugă"
 
 #: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Nume de scris"
+msgstr "Numele fișierului pentru scriere"
 
 #: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Fiºierul existã, SUPRASCRIE ? "
+msgstr "Fișierul există, SE SUPRASCRIE ? "
 
 #: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Salveazã fiºierul sun UN NUME DIFERIT ? "
+msgstr "Salvează fișierul cu un NUME DIFERIT? "
 
 #: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"Fișierul a fost modificat de când l-ați deschis, se continuă salvarea? "
 
 #: src/files.c:2882
 msgid "(more)"
-msgstr "(suplimentar)"
+msgstr "(mai mult)"
 
 #: src/files.c:2974
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Apãsaþi Return/Enter pentru a continua lansarea nano\n"
+"Apăsați Enter pentru a continua\n"
 
 #: src/files.c:2989
 #, c-format
@@ -357,6 +395,9 @@ msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
+"Imposibil de creat directorul %s: %s\n"
+"Este necesar pentru salvarea/încărcarea istoricului de salvări sau pozițiile "
+"cursorului.\n"
 
 #: src/files.c:2995
 #, c-format
@@ -364,6 +405,9 @@ msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
+"Calea %s nu este un director și trebuie să fie.\n"
+"Nano nu va putea să încarce sau să salveze istoricul sau pozițiile "
+"cursorului.\n"
 
 #: src/files.c:3012
 #, c-format
@@ -371,6 +415,9 @@ msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am încercat să îl "
+"mut\n"
+" în locația preferată (%s) dar am întâmpinat o eroare: %s"
 
 #: src/files.c:3016
 #, c-format
@@ -379,471 +426,431 @@ msgid ""
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am l-am mutat\n"
+" în locația preferată (%s)\n"
+"(vezi secțiunea FAQ nano despre această schimbare)"
 
 #. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:477
 msgid "Exit"
-msgstr "Terminã"
+msgstr "Ieșire"
 
 #: src/global.c:478
 msgid "Close"
-msgstr "Închide"
+msgstr "ÃŽnchide"
 
 #: src/global.c:479
-#, fuzzy
 msgid "Uncut Text"
-msgstr "Anuleazã tãiere text"
+msgstr "Lipește"
 
 #: src/global.c:481
-#, fuzzy
 msgid "Unjustify"
-msgstr "De-aliniazã"
+msgstr "Anul. alin."
 
 #. TRANSLATORS: Try to keep this at most 12 characters.
 #: src/global.c:485
-#, fuzzy
 msgid "WhereIs Next"
-msgstr "Unde este Urmãtor"
+msgstr "Căutarea urm."
 
 #. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
 #: src/global.c:492
 msgid "Where Is"
-msgstr "Unde este"
+msgstr "Caută"
 
 #: src/global.c:493
 msgid "Replace"
-msgstr "Înlocuieºte"
+msgstr "Înlocuiește"
 
 #: src/global.c:494
 msgid "Go To Line"
-msgstr "Du-te la linia"
+msgstr "Depl. linie"
 
 #: src/global.c:495
 msgid "Prev Line"
-msgstr "Linia precedentã"
+msgstr "Linia anterioară"
 
 #: src/global.c:496
 msgid "Next Line"
-msgstr "Linia urmãtoare"
+msgstr "Linia următoare"
 
 #: src/global.c:497
 msgid "Read File"
-msgstr "Citeºte fiºier"
+msgstr "Citire fiÈ™."
 
 #: src/global.c:499
 msgid "FullJstify"
-msgstr "AliniazãTotal"
+msgstr "Alin.compl"
 
 #: src/global.c:501
 msgid "Refresh"
-msgstr "Împrospãteazã"
+msgstr "Reîmprospătează"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
 #: src/global.c:507
 msgid "Justify the current paragraph"
-msgstr "Aliniazã paragraful curent"
+msgstr "Aliniază paragraful curent"
 
 #: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Anuleazã funcþia curentã"
+msgstr "Anulează funcția curentă"
 
 #: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Afișează acest text de ajutor"
 
 #: src/global.c:513
-#, fuzzy
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Închide fiºierul încãrcat curent/Ieºi din nano"
+msgstr "Închide spațiul curent / Ieșire din nano"
 
 #: src/global.c:515
 msgid "Exit from nano"
-msgstr "Ieºire din nano"
+msgstr "Ieșire din nano"
 
 #: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Scrie fiºierul curent pe disc"
+msgstr "Scrie fișierul curent pe disc"
 
 #: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Insereazã alt fiºier în fiºierul curent"
+msgstr "Inserează alt fișier în fișierul curent"
 
 #: src/global.c:523
-#, fuzzy
 msgid "Search for a string or a regular expression"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Caută un text sau o expresie regulată"
 
 #: src/global.c:526
 msgid "Search for a string"
-msgstr ""
+msgstr "Caută un text"
 
 #: src/global.c:528
 msgid "Go one screenful up"
-msgstr ""
+msgstr "Deplasează cursorul în sus cu un ecran"
 
 #: src/global.c:529
 msgid "Go one screenful down"
-msgstr ""
+msgstr "Deplasează cursorul în jos cu un ecran"
 
 #: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
+msgstr "Decupează linia curentă și o păstrează în memoria temporară"
 
 #: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Copiazã din cutbufer în linia curentã"
+msgstr "Lipește din memoria temporară în linia curentă"
 
 #: src/global.c:534
-#, fuzzy
 msgid "Display the position of the cursor"
-msgstr "Aratã poziþia cursorului"
+msgstr "Afișează poziția cursorului"
 
 #: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Invocã corectorul ortografic, dacã e disponibil"
+msgstr "Invocă corectorul ortografic, dacă este disponibil"
 
 #: src/global.c:538
-#, fuzzy
 msgid "Replace a string or a regular expression"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Înlocuiește un text sau o expresie regulată"
 
 #: src/global.c:539
-#, fuzzy
 msgid "Go to line and column number"
-msgstr "Du-te la o anumitã linie"
+msgstr "Deplasează cursorul la linia și coloana numărul"
 
 #: src/global.c:541
-#, fuzzy
 msgid "Mark text starting from the cursor position"
-msgstr "Marcheazã textul la poziþia curentã a cursorului"
+msgstr "Marchează începutul textului de la poziția cursorului"
 
 #: src/global.c:542
-#, fuzzy
 msgid "Repeat the last search"
-msgstr "Repetã ultima cãutare"
+msgstr "Repetă ultima căutare"
 
 #: src/global.c:544
-#, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
+msgstr "Copiază linia curentă și o păstrează în memoria temporară"
 
 #: src/global.c:545
-#, fuzzy
 msgid "Indent the current line"
-msgstr "Adaugã la fiºierul curent"
+msgstr "Mărește marginea liniei curente"
 
 #: src/global.c:546
-#, fuzzy
 msgid "Unindent the current line"
-msgstr "Adaugã la fiºierul curent"
+msgstr "Micșorează marginea liniei curente"
 
 #: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Anulează ultima operație"
 
 #: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Repetă ultima operație anulată"
 
 #: src/global.c:550
-#, fuzzy
 msgid "Go forward one character"
-msgstr "Du-te înainte un caracter"
+msgstr "Avansează cu un caracter"
 
 #: src/global.c:551
-#, fuzzy
 msgid "Go back one character"
-msgstr "Du-te înapoi un caracter"
+msgstr "ÃŽnapoi cu un caracter"
 
 #: src/global.c:553
-#, fuzzy
 msgid "Go forward one word"
-msgstr "Du-te înainte un cuvânt"
+msgstr "Avansează cu un cuvânt"
 
 #: src/global.c:554
-#, fuzzy
 msgid "Go back one word"
-msgstr "Du-te înapoi un cuvânt"
+msgstr "Înapoi cu un cuvânt"
 
 #: src/global.c:556
-#, fuzzy
 msgid "Go to previous line"
-msgstr "Du-te la linia precedentã"
+msgstr "Deplasează cursorul la linia anterioară"
 
 #: src/global.c:557
-#, fuzzy
 msgid "Go to next line"
-msgstr "Du-te la linia urmãtoare"
+msgstr "Deplasează cursorul la linia următoare"
 
 #: src/global.c:558
-#, fuzzy
 msgid "Go to beginning of current line"
-msgstr "Du-te la începutul liniei"
+msgstr "Deplasează cursorul la începutul liniei curente"
 
 #: src/global.c:559
-#, fuzzy
 msgid "Go to end of current line"
-msgstr "Du-te la sfârºitul liniei"
+msgstr "Deplasează cursorul la sfârșitul liniei curente"
 
 #: src/global.c:562
-#, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Du-te la începutul paragrafului curent"
+msgstr ""
+"Deplasează cursorul la începutul paragrafului; apoi la începutul "
+"paragrafului anterior"
 
 #: src/global.c:564
-#, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Du-te la sfârºitul paragrafului curent"
+msgstr ""
+"Deplasează cursorul dincolo de sfârșitul paragrafului; apoi la sfârșitul "
+"paragrafului următor"
 
 #: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Du-te la prima linie din fiºier"
+msgstr "Deplasează cursorul la prima linie din fișier"
 
 #: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Du-te la ultima linie din fiºier"
+msgstr "Deplasează cursorul la ultima linie din fișier"
 
 #: src/global.c:569
-#, fuzzy
 msgid "Go to the matching bracket"
-msgstr "Nici o parantezã pereche"
+msgstr "Deplasează cursorul la paranteza pereche"
 
 #: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în sus o linie fără a deplasa cursorul"
 
 #: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în jos o linie fără a deplasa cursorul"
 
 #: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Du-te la buferul de fiºier precedent"
+msgstr "Comută la spațiul fișier anterior"
 
 #: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Schimbã la urmãtorul bufer de fiºier"
+msgstr "Comută la următorul spațiu fișier"
 
 #: src/global.c:579
-#, fuzzy
 msgid "Insert the next keystroke verbatim"
-msgstr "Insereazã caracter(e) identic"
+msgstr "Inserează următoarea apăsare de tastă verbatim"
 
 #: src/global.c:580
-#, fuzzy
 msgid "Insert a tab at the cursor position"
-msgstr "Insereazã un caracter tab la poziþia curentã a cursorului"
+msgstr "Inserează un tab la poziția cursorului"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr ""
-"Insereazã un caracter \"carriage return\" la poziþia curentã a cursorului"
+msgstr "Inserează o linie nouă la poziția cursorului"
 
 #: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "ªterge caracterul de sub cursor"
+msgstr "Șterge caracterul de sub cursor"
 
 #: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "ªterge caracterul de la stânga cursorului"
+msgstr "Șterge caracterul de la stânga cursorului"
 
 #: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Taie de la cursor pânã la sfârºitul fiºierului"
+msgstr "Decupează de la cursor până la sfârșitul fișierului"
 
 #: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Aliniazã întregul fiºier"
+msgstr "Aliniază întregul fișier"
 
 #: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Contorizează numărul cuvintelor, liniilor și caracterelor"
 
 #: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Reîmprospãteazã zona de ecran curentã"
+msgstr "Reîmprospătează zona de ecran curentă"
 
 #: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspendă editorul (dacă suspendarea este activată)"
 
 #: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Comută sensibilitatea la majuscule a căutării"
 
 #: src/global.c:604
-#, fuzzy
 msgid "Reverse the direction of the search"
-msgstr "Aratã poziþia cursorului"
+msgstr "Inversează direcția căutării"
 
 #: src/global.c:608
-#, fuzzy
 msgid "Toggle the use of regular expressions"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Comută folosirea expresiilor regulate"
 
 #: src/global.c:612
-#, fuzzy
 msgid "Recall the previous search/replace string"
-msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
+msgstr "Reapelează șirul anterior caută/înlocuiește"
 
 #: src/global.c:614
-#, fuzzy
 msgid "Recall the next search/replace string"
-msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
+msgstr "Reapelează șirul următor caută/înlocuiește"
 
 #: src/global.c:617
 msgid "Go to file browser"
-msgstr "Du-te la navigatorul de fiºiere"
+msgstr "Mergi la navigatorul de fișiere"
 
 #: src/global.c:620
-#, fuzzy
 msgid "Toggle the use of DOS format"
-msgstr "Scrie fiºierul ieºire în format DOS"
+msgstr "Comută folosirea formatului DOS"
 
 #: src/global.c:621
-#, fuzzy
 msgid "Toggle the use of Mac format"
-msgstr "Scrie fiºierul ieºire în format Mac"
+msgstr "Comuta folosirea formatului Mac"
 
 #: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Comută adăugarea la sfârșit"
 
 #: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Comută adăugarea la început"
 
 #: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Comută realizarea copiei de siguranță a fișierului original"
 
 #: src/global.c:625
 msgid "Execute external command"
-msgstr "Executã comandã externã"
+msgstr "Execută comandă externă"
 
 #: src/global.c:628
-#, fuzzy
 msgid "Toggle the use of a new buffer"
-msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
+msgstr "Comută folosirea unui spațiu nou"
 
 #: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Ieºi din navigatorul de fiºiere"
+msgstr "Ieși din navigatorul de fișiere"
 
 #: src/global.c:632
-#, fuzzy
 msgid "Go to the first file in the list"
-msgstr "Du-te la prima linie din fiºier"
+msgstr "Deplasează cursorul la primul fișier din listă"
 
 #: src/global.c:633
-#, fuzzy
 msgid "Go to the last file in the list"
-msgstr "Du-te la ultima linie din fiºier"
+msgstr "Deplasează cursorul la ultimul fișier din listă"
 
 #: src/global.c:634
-#, fuzzy
 msgid "Go to the previous file in the list"
-msgstr "Du-te la linia precedentã"
+msgstr "Deplasează cursorul la fișierul anterior din listă"
 
 #: src/global.c:635
-#, fuzzy
 msgid "Go to the next file in the list"
-msgstr "Du-te la linia urmãtoare"
+msgstr "Deplasează cursorul la următorul fișier din listă"
 
 #: src/global.c:636
 msgid "Go to directory"
-msgstr "Du-te la director"
+msgstr "Mergi la director"
 
 #: src/global.c:639
-#, fuzzy
 msgid "Invoke the linter, if available"
-msgstr "Invocã corectorul ortografic, dacã e disponibil"
+msgstr "Apelează analiza statică, dacă este disponibilă"
 
 #: src/global.c:640
-#, fuzzy
 msgid "Go to previous linter msg"
-msgstr "Du-te la linia precedentã"
+msgstr "Mergi la mesajul anterior al analizei statice"
 
 #: src/global.c:641
-#, fuzzy
 msgid "Go to next linter msg"
-msgstr "Du-te la linia urmãtoare"
+msgstr "Mergi la mesajul următor al analizei statice"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Invocã corectorul ortografic, dacã e disponibil"
+msgstr "Apelează utilitarul de formatare, dacă este disponibil"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
 msgid "Get Help"
-msgstr "Cere ajutor"
+msgstr "Ajutor"
 
 #: src/global.c:665 src/prompt.c:1084
 msgid "Cancel"
-msgstr "Renunþã"
+msgstr "Renunță"
 
 #: src/global.c:678
-#, fuzzy
 msgid "Write Out"
-msgstr "Scrie ieºire"
+msgstr "Salvează"
 
 #: src/global.c:704
 msgid "Go To Dir"
-msgstr "Du-te la Director"
+msgstr "Mergi la Director"
 
 #: src/global.c:719
 msgid "Cut Text"
-msgstr "Taie text"
+msgstr "Decupează"
 
 #: src/global.c:728
 msgid "Justify"
-msgstr "Aliniazã"
+msgstr "Aliniază"
 
 #: src/global.c:733
 msgid "To Spell"
-msgstr "De ortografiat"
+msgstr "Ortograf."
 
 #: src/global.c:738
-#, fuzzy
 msgid "To Linter"
-msgstr "Du-te la linia"
+msgstr "Analiză statică"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Format DOS"
+msgstr "Formatare"
 
 #: src/global.c:745
 msgid "Case Sens"
-msgstr "Cu majuscule semnificative"
+msgstr "Sensibil Majusc."
 
 #: src/global.c:750
 msgid "Regexp"
 msgstr "Regexp"
 
 #: src/global.c:755
-#, fuzzy
 msgid "Backwards"
-msgstr " [Înapoi]"
+msgstr "ÃŽnapoi"
 
 #: src/global.c:762
 msgid "No Replace"
-msgstr "Nici o înlocuire"
+msgstr " Nicio înlocuire"
 
 #: src/global.c:770
 msgid "Cur Pos"
-msgstr "Poz. Crt."
+msgstr "Poz. curent."
 
 #: src/global.c:780
 msgid "Prev Page"
-msgstr "Pagina precedentã"
+msgstr "Pagina anter."
 
 #: src/global.c:782
 msgid "Next Page"
-msgstr "Pagina urmãtoare"
+msgstr "Pagina urm."
 
 #: src/global.c:785
 msgid "First Line"
@@ -854,89 +861,84 @@ msgid "Last Line"
 msgstr "Ultima linie"
 
 #: src/global.c:794
-#, fuzzy
 msgid "To Bracket"
-msgstr "Nu este o parantezã"
+msgstr "Paranteză"
 
 #: src/global.c:797
 msgid "Mark Text"
-msgstr "Marcheazã text"
+msgstr "Marchează text"
 
 #: src/global.c:800
-#, fuzzy
 msgid "Copy Text"
-msgstr "Taie text"
+msgstr "Copiază text"
 
 #: src/global.c:803
-#, fuzzy
 msgid "Indent Text"
-msgstr "Taie text"
+msgstr "Măreș. marg"
 
 #: src/global.c:805
 msgid "Unindent Text"
-msgstr ""
+msgstr "MicÈ™. marg"
 
 #: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Anulează"
 
 #: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "Repetă"
 
 #: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Înapoi"
+msgstr "ÃŽnapoi"
 
 #: src/global.c:816 src/global.c:822
 msgid "Forward"
-msgstr "Înainte"
+msgstr "ÃŽnainte"
 
 #: src/global.c:827
 msgid "Prev Word"
-msgstr "Cuvânt precedent"
+msgstr "Cuvânt anterior"
 
 #: src/global.c:829
 msgid "Next Word"
-msgstr "Cuvânt urmãtor"
+msgstr "Cuvântul următor"
 
 #: src/global.c:833
 msgid "Home"
-msgstr "Acasã"
+msgstr "Acasă"
 
 #: src/global.c:835
 msgid "End"
-msgstr "Sfârºit"
+msgstr "Sfârșit"
 
 #: src/global.c:844
 msgid "Beg of Par"
-msgstr "Început Par"
+msgstr "ÃŽnceput Par"
 
 #: src/global.c:846
 msgid "End of Par"
-msgstr "Sfârºit Par"
+msgstr "Sfârșit Par"
 
 #: src/global.c:851
 msgid "Scroll Up"
-msgstr ""
+msgstr "Derulează în sus"
 
 #: src/global.c:853
 msgid "Scroll Down"
-msgstr ""
+msgstr "Derulează în jos"
 
 #: src/global.c:858
-#, fuzzy
 msgid "Prev File"
-msgstr "Fiºier precedent"
+msgstr "Fișierul anterior"
 
 #: src/global.c:860
 msgid "Next File"
-msgstr "Fiºier urmãtor"
+msgstr "FiÈ™ urm"
 
 #: src/global.c:869
-#, fuzzy
 msgid "Verbatim"
-msgstr "Intrare identicã"
+msgstr "Verbatim"
 
 #: src/global.c:872
 msgid "Tab"
@@ -948,37 +950,35 @@ msgstr "Enter"
 
 #: src/global.c:876
 msgid "Delete"
-msgstr "ªterge"
+msgstr "Șterge"
 
 #: src/global.c:878
 msgid "Backspace"
-msgstr "ªterge înapoi (backspace)"
+msgstr "Șterge înapoi"
 
 #: src/global.c:888
 msgid "CutTillEnd"
-msgstr "TaiePânãLaSfârºit"
+msgstr "Taie->Sfârșit"
 
 #: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Contorizare cuvinte"
 
 #: src/global.c:905
 msgid "Suspend"
-msgstr "Suspendã"
+msgstr "Suspendă"
 
 #: src/global.c:910
-#, fuzzy
 msgid "PrevHstory"
-msgstr "Istorie"
+msgstr "Anterioara"
 
 #: src/global.c:913
-#, fuzzy
 msgid "NextHstory"
-msgstr "Istorie"
+msgstr "Următoarea"
 
 #: src/global.c:917
 msgid "Go To Text"
-msgstr "Du-te la text"
+msgstr "Deplasează la text"
 
 #: src/global.c:928
 msgid "DOS Format"
@@ -990,118 +990,109 @@ msgstr "Format Mac"
 
 #: src/global.c:934
 msgid "Append"
-msgstr "Adaugã"
+msgstr "Adaugă la sfârșit"
 
 #: src/global.c:936
 msgid "Prepend"
-msgstr "Pre-adaugã"
+msgstr "Adaugă la început"
 
 #: src/global.c:939
 msgid "Backup File"
-msgstr "Fiºier copie de siguranþã (backup)"
+msgstr "Fișier copie de rezervă"
 
 #: src/global.c:946
 msgid "Execute Command"
-msgstr "Executã comandã"
+msgstr "Execută comandă"
 
 #: src/global.c:961
 msgid "To Files"
-msgstr "În fiºiere"
+msgstr "La fișiere"
 
 #: src/global.c:964
-#, fuzzy
 msgid "First File"
-msgstr "Prima linie"
+msgstr "Primul fișier"
 
 #: src/global.c:966
-#, fuzzy
 msgid "Last File"
-msgstr "Ultima linie"
+msgstr "Ultimul fișier"
 
 #: src/global.c:977
-#, fuzzy
 msgid "Prev Lint Msg"
-msgstr "Linia precedentã"
+msgstr "Analiză anter."
 
 #: src/global.c:979
-#, fuzzy
 msgid "Next Lint Msg"
-msgstr "Linia urmãtoare"
+msgstr "Analiza urm."
 
 #. TRANSLATORS: The next seventeen strings are toggle descriptions;
 #. * they are best kept shorter than 40 characters, but may be longer.
 #: src/global.c:1227
 msgid "Help mode"
-msgstr "Mod Ajutor"
+msgstr "Bara de ajutor"
 
 #: src/global.c:1229
-#, fuzzy
 msgid "Constant cursor position display"
-msgstr "Poziþie cursor neschimbatã"
+msgstr "Afișare continuă poziție cursor"
 
 #: src/global.c:1231
-#, fuzzy
 msgid "Use of one more line for editing"
-msgstr "Foloseºte mai mult spaþiu pentru editare"
+msgstr "Folosire a unei linii suplimentare pentru editare"
 
 #: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Rulare (scrolling) finã"
+msgstr "Derulare fină"
 
 #: src/global.c:1235
-#, fuzzy
 msgid "Soft wrapping of overlong lines"
-msgstr "Nu sparge (wrap) liniile lungi"
+msgstr "Rupere ușoară a liniilor lungi"
 
 #: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Afiºeazã spaþiu-alb"
+msgstr "Afișare spațiu-alb"
 
 #: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Evidenþiere sintaxã color"
+msgstr "Evidențiere sintaxă color"
 
 #: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tastã acasã inteligentã"
+msgstr "Tastă acasă inteligentă"
 
 #: src/global.c:1243
 msgid "Auto indent"
-msgstr "Auto paragraf"
+msgstr "Auto identare"
 
 #: src/global.c:1245
 msgid "Cut to end"
-msgstr "Taie pânã la sfârºit"
+msgstr "Decupare până la sfârșit"
 
 #: src/global.c:1247
-#, fuzzy
 msgid "Hard wrapping of overlong lines"
-msgstr "Nu sparge (wrap) liniile lungi"
+msgstr "Rupere permanentă a liniilor lungi"
 
 #: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Conversie a tab-urilor introduse în spații"
 
 #: src/global.c:1251
 msgid "Backup files"
-msgstr "Fiºiere copie de siguranþã (backup)"
+msgstr "Salvare fișiere copii de rezervă"
 
 #: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Multiple bufere fiºiere"
+msgstr "Editare spații multiple de fișiere"
 
 #: src/global.c:1255
 msgid "Mouse support"
-msgstr "Suport maus"
+msgstr "Funcționalitate maus"
 
 #: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "Nici o conversie de format DOS/Mac"
+msgstr "Conversie din formatul DOS/Mac"
 
 #: src/global.c:1259
-#, fuzzy
 msgid "Suspension"
-msgstr "Suspendã"
+msgstr "Suspendare"
 
 #: src/help.c:205
 msgid ""
@@ -1115,15 +1106,16 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Text de ajutor pentru comanda \"Cautã\"\n"
+" Text de ajutor pentru comanda de căutare\n"
 "\n"
-" Introduceþi cuvintele sau caracterele pe care aþi dori sã le cãutaþi, apoi "
-"apãsaþi Enter.  Dacã existã vreo potrivire pentru textul cãutat, ecranul va "
-"fi actualizat la locaþia cea mai apropiatã de locul unde aceastã potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
 "\n"
-" ªirul cãutat anterior va fi arãtat în paranteze dupã prompt-ul de cãutare. "
-"Apãsând Enter fãrã a introduce vreun text va executa cãutarea anterioarã.  "
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"căutare. Apăsând Enter fără a introduce vreun text, se va executa căutarea "
+"cu textul căutat anterior. "
 
 #: src/help.c:214
 msgid ""
@@ -1133,10 +1125,11 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Dacã aþi selectat text cu marcajul ºi apoi cãutaþi pentru a înlocui, numai "
-"potrivirile din textul selectat vor fi înlocuite.\n"
+"Dacă ați selectat text cu marcajul și apoi folosiți funcția de căutare "
+"pentru a înlocui, numai potrivirile din textul selectat vor fi înlocuite.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul de căutare:\n"
 "\n"
-"Urmãtoarele taste de funcþii sunt disponibile în modul \"Cautã\":\n"
 
 #: src/help.c:220
 msgid ""
@@ -1149,13 +1142,15 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Du-te la linia\"\n"
+" Text de ajutor pentru comanda de deplasare la linia indicată\n"
+"\n"
+" Introduceți numărul liniei unde doriți să ajungeți și apăsați Enter. Dacă "
+"există mai puține linii de text decât numărul introdus veți ajunge la ultima "
+"linie a fișierului.\n"
 "\n"
-" Introduceþi numãrul liniei unde doriþi sã mergeþi ºi apãsaþi Enter. Dacã "
-"existã mai puþine linii de text decât numãrul introdus veþi ajunge la ultima "
-"linie a fiºierului.\n"
+" Următoarele taste de funcții sunt disponibile în modul de deplasare la "
+"linia:\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Du-te la linia\":\n"
 
 #: src/help.c:229
 msgid ""
@@ -1169,16 +1164,17 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"Textul de ajutor pentru comanda \"Insereazã fiºier\"\n"
+" Text de ajutor pentru comanda de inserare fișier\n"
 "\n"
-" Tastaþi numele unui fiºier de introdus în buferul fiºierului curent la "
-"poziþia curentã a cursorului.\n"
+" Tastați numele unui fișier de inserat în spațiul fișierului curent. Va fi "
+"inserat acolo unde se află poziția cursorului.\n"
 "\n"
-"  Dacã aþi compilat nano cu suport pentru multiple bufere ºi aþi activat "
-"acestã opþiune cu indicatorii de linie de comandã -F sau --multibufer, "
-"comutatorul Meta-F, sau un fiºier nanorc, inserând un fiºier va face ca "
-"acesta sã fie încãrcat într-un alt bufer (folosiþi Meta-< ºi > pentru a "
-"comuta între bufere). "
+" Dacă ați compilat nano cu capacitatea de a gestiona simultan mai multe "
+"spații de fișiere și ați activat această opțiune cu opțiunea din linie de "
+"comandă -F sau --multibufer, comutatorul Meta-F, sau prin fișierul nanorc, "
+"inserarea unui fișier va face ca acesta să fie încărcat într-un spațiu "
+"separat (folosiți Meta-< și Meta-> pentru a comuta între spațiile de "
+"fișiere). "
 
 #: src/help.c:238
 msgid ""
@@ -1188,11 +1184,12 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Dacã aveþi nevoie de un alt bufer gol, nu introduceþi nici un nume sau "
-"introduceþi un nume de fiºier ce nu existã ºi apãsaþi Enter.\n"
+"Dacă aveți nevoie de un alt spațiu gol, nu introduceți nici un nume sau "
+"introduceți un nume de fișier ce nu există și apăsați Enter.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul inserare de "
+"fișiere:\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Insereazã fiºier"
-"\":\n"
 
 #: src/help.c:244
 msgid ""
@@ -1209,17 +1206,17 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Scrie fiºier\"\n"
+" Text de ajutor pentru comanda de salvare a fișierului\n"
 "\n"
-" Tastaþi numele sub care doriþi sã salvaþi fiºierul curent ºi apãsaþi Enter "
-"pentru a salva fiºierul.\n"
+" Tastați numele sub care doriți să salvați fișierul curent și apăsați Enter "
+"pentru a salva fișierul.\n"
 "\n"
-" Dacã aþi selectat text cu marcajul, veþi fi interpolat sã salvaþi numai "
-"porþiunea selectatã într-un fiºier separat.  Pentru a reduce ºansa de a "
-"suprascrie fiºierul curent cu doar o porþiune a sa, numele fiºierului curent "
-"nu este implicit în acest mod.\n"
+" Dacă ați selectat text cu marcajul, vi se va propune să salvați doar "
+"porțiunea selectată într-un fișier separat. Pentru a micșora riscul de a "
+"suprascrie fișierul curent cu doar o porțiune a sa,în acest mod numele "
+"fișierului curent nu este propus implicit.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Scrie fiºier\"\n"
+" Următoarele taste de funcții sunt disponibile în modul salvare de fișier:\n"
 "\n"
 
 #: src/help.c:258
@@ -1235,20 +1232,20 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru \"Navigator fiºiere\"\n"
+" Textul de ajutor pentru navigatorul de fișiere\n"
 "\n"
-" Navigatorul de fiºiere este folosit pentru a naviga vizual structura de "
-"directoare ºi a selecta un fiºier pentru citire sau scriere.  Puteþi folosi "
-"tastele cu sãgeþi sau Page Up/Down pentru a naviga prin fiºiere, ºi S sau "
-"Enter pentru a alege fiºierul selectat sau a intra într-un director "
-"selectat. Pentru a vã muta în sus un nivel, selectaþi directorul numit \".."
-"\" din capãtul de sus a listei de fiºiere.\n"
+" Navigatorul de fișiere este folosit pentru a parcurge vizual structura de "
+"directoare cu scopul de a selecta un fișier pentru citire sau scriere. "
+"Puteți folosi tastele cu săgeți sau Page Up/Down pentru a parcurge "
+"fișierele, tastele S sau Enter pentru a alege fișierul selectat sau a intra "
+"în directorul selectat. Pentru a urca în ierarhia directoarelor, selectați "
+"directorul numit „..” din partea de sus a listei de fișiere.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în \"Navigator fiºiere\":\n"
+" Următoarele taste de funcții sunt disponibile în modul navigator de "
+"fișiere:\n"
 "\n"
 
 #: src/help.c:271
-#, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1261,21 +1258,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Cautã\"\n"
+" Text de ajutor pentru comanda de căutare a navigatorului\n"
 "\n"
-" Introduceþi cuvintele sau caracterele pe care aþi dori sã le cãutaþi, apoi "
-"apãsaþi Enter.  Dacã existã vreo potrivire pentru textul cãutat, ecranul va "
-"fi actualizat la locaþia cea mai apropiatã de locul unde aceastã potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
+"\n"
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"căutare. Apăsând Enter fără a introduce vreun text va executa căutarea cu "
+"textul căutat anterior.\n"
 "\n"
-" ªirul cãutat anterior va fi arãtat în paranteze dupã prompt-ul de cãutare. "
-"Apãsând Enter fãrã a introduce vreun text va executa cãutarea anterioarã.  "
 
 #: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Următoarele taste de funcții sunt disponibile în modul de căutare "
+"navigator:\n"
+"\n"
 
 #: src/help.c:284
 msgid ""
@@ -1289,19 +1291,18 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Navigator Du-te la Directorul\"\n"
+" Text de ajutor pentru comanda de schimbare a directorului\n"
 "\n"
-" Introduceþi numele directorului pe care aþi dori sã-l navigaþi.\n"
+" Introduceți numele directorului pe care ați dori să-l parcurgeți.\n"
 "\n"
-" Dacã completarea cu tab nu a fost deactivatã, puteþi folosi tasta TAB "
-"pentru a încerca sã completaþi automat numele directorului.\n"
+" Dacă completarea cu tab nu a fost dezactivată, puteți folosi tasta Tab "
+"pentru a încerca completarea automată a numelui directorului.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Navigator Du-te la "
-"Directorul\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de schimbare a "
+"directorului:\n"
 "\n"
 
 #: src/help.c:297
-#, fuzzy
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1314,20 +1315,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru \"Corector ortografic\"\n"
+" Text de ajutor pentru corectorul ortografic\n"
 "\n"
-" Corectorul ortografic verificã ortografierea întregului text din fiºierul "
-"curent.  Când este întâlnit un cuvânt necunoscut, acesta este evidenþiat ºi "
-"poate fi introdus/editat un înlocuitor.  Corectorul vã va întreba dacã "
-"doriþi sã înlocuiþi toate apariþiile cu aceeaºi greºealã în fiºierul curent, "
-"sau, dacã aþi selectat text cu marcajul, în textul selectat.\n"
+" Corectorul ortografic verifică toate textele fișierului curent. Când este "
+"întâlnit un cuvânt necunoscut, acesta va fi subliniat și va putea fi "
+"corectat. Apoi vi se va propune să înlocuiți fiecare apariție a acestui "
+"cuvânt greșit în fișierul curent, sau, dacă ați selectat text prin marcarea "
+"acestuia, în textul selectat.\n"
 "\n"
-" Urmãtoarele alte funcþii sunt disponibile în modul \"Corector ortografic"
-"\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de corector "
+"ortografic:\n"
 "\n"
 
 #: src/help.c:312
-#, fuzzy
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1338,17 +1338,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor \"Comandã externã\"\n"
+" Text de ajutor pentru execuție comenzi externe\n"
 "\n"
-" Acest meniu vã permite sã inseraþi ieºirea unei comenzi executate de shell "
-"în buferul curent (sau într-un nou bufer în modul multibufer). Dacã doriþi "
-"un alt bufer gol, nu introduceþi nici o comandã.\n"
+" Acest meniu vă permite să inserați textul produs de execuția unei comenzi "
+"rulată de shell în spațiul curent (sau un spațiu nou în modul multi-spațiu). "
+"Dacă aveți nevoie de un spațiu gol, nu introduceți nici o comandă.\n"
 "\n"
-" Urmãtoarele taste sunt disponibile în acest mod:\n"
+" Următoarele taste de funcții sunt disponibile în modul de execuție comenzi "
+"externe:\n"
 "\n"
 
 #: src/help.c:325
-#, fuzzy
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1359,21 +1359,17 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" text ajutor pentru nano\n"
-"\n"
-" Editotul nano este proiectat sa emuleze funþionalitatea ºi uºurinþa de "
-"folosire a editorului de texte UW Pico.  Existã patru secþiuni principale "
-"ale editorului: Linia de sus aratã versiunea programului, numele fiºierului "
-"curent ce este editat ºi dacã fiºierul a fost sau nu modificat.  Urmãtoarea "
-"secþiune principalã este fereastra de editare ce aratã fiºierul ce este "
-"editat.  Linia de stare este a treia linie de jos ºi aratã mesaje "
-"importante.  Ultimele douã linii aratã cele mai frecvente scurtãturi "
-"folosite în editor.\n"
+" Text principal de ajutor pentru nano\n"
 "\n"
-" "
+" Editorul nano este conceput sa reproducă funcționalitatea și ușurința de "
+"utilizare ale editorului Pico de la Universitatea Washington. Există patru "
+"secțiuni principale ale editorului. Linia de sus arată versiunea "
+"programului, numele fișierului în curs de editare și dacă fișierul a fost "
+"modificat sau nu. Mai jos urmează fereastra de editare principală care arată "
+"fișierul în curs de modificare. Linia de stare este a treia linie de jos, "
+"aceasta afișează mesajele importante. "
 
 #: src/help.c:335
-#, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1383,11 +1379,14 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"Notaþia pentru scurtãturi este dupã cum urmeazã: secvenþe Control-tastã sunt "
-"notate cu un simbol (^) ºi sunt introduse cu tasta Control (Ctrl) sau "
-"apãsând tasta Esc de douã ori.  Secvenþele Escape-tastã sunt notate cu "
-"simbolul Meta (M) ºi pot fi introduse folosind oricare din tastele Esc, Alt "
-"sau Meta, în funcþie de setarea tastaturii d-voastrã.  "
+"Ultimele două linii arată cele mai frecvente scurtături folosite în "
+"editor. \n"
+"\n"
+" Notația pentru scurtături este după cum urmează: Secvențele control-tastă "
+"sunt notate cu un simbol caret (^) și pot fi introduse fie folosind tasta "
+"Control (Ctrl) sau apăsând tasta Escape (Esc) de două ori. Secvențele Escape-"
+"tastă sunt notate cu simbolul Meta (M) și pot fi introduse folosind oricare "
+"din tastele Esc, Alt sau Meta, în funcție de configurația tastaturii. "
 
 #: src/help.c:344
 msgid ""
@@ -1397,21 +1396,19 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"De asemenea, apãsând tasta Esc de douã ori apoi tastând un numãr din trei "
-"cifre de la 000 la 255 va introduce caracterul cu codul ASCII "
-"corespunzãtor.  Urmãtoarele combinaþii de taste sunt disponibile în "
-"fereastra de editare principalã.  Tastele alternative sunt arãtate în "
-"paranteze:\n"
+"De asemenea, apăsând tasta Esc de două ori apoi tastând un număr din trei "
+"cifre de la 000 la 255 se va introduce caracterul cu codul ASCII "
+"corespunzător. Următoarele combinații de taste sunt disponibile în fereastra "
+"de editare principală. Tastele alternative sunt afișate între paranteze:\n"
 "\n"
 
 #: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "activeazã/deactiveazã"
+msgstr "[activare | dezactivare]"
 
 #: src/nano.c:601
-#, fuzzy
 msgid "Key invalid in view mode"
-msgstr "Tastã ilegalã în modul VIZUALIZARE"
+msgstr "Tastă nevalidă în modul vizualizare"
 
 #: src/nano.c:713
 #, c-format
@@ -1420,29 +1417,29 @@ msgid ""
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiu scris în %s\n"
 
 #: src/nano.c:715
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiu nu s-a scris în %s: %s\n"
 
 #: src/nano.c:718
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiul nu s-a scris: %s\n"
 
 #: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Dimensiunea ferestrei prea micã pentru nano...\n"
+msgstr "Dimensiunea ferestrei este prea mică pentru nano...\n"
 
 #: src/nano.c:836
 #, c-format
@@ -1450,358 +1447,334 @@ msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Folosire: nano [OPȚIUNI] [[+LINIE,COLOANĂ] FIȘIER]...\n"
+"\n"
 
 #: src/nano.c:839
-#, fuzzy, c-format
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opþiune\t\tOpþiune lungã\t\tÎnþeles\n"
+msgstr "Opțiune\t\tOpțiune lungă GNU\t\tSemnificație\n"
 
 #: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Opþiune\t\tÎnþeles\n"
+msgstr "Opțiune\t\tSemnificație\n"
 
 #: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+LINIE,COLOANÄ‚"
 
 #. TRANSLATORS: The next forty or so strings are option descriptions
 #. * for the --help output.  Try to keep them at most 40 characters.
 #: src/nano.c:847
-#, fuzzy
 msgid "Start at line LINE, column COLUMN"
-msgstr "Începe la linia cu numãrul LINIE"
+msgstr "ÃŽncepe la linia LINIE, coloana COLOANÄ‚"
 
 #: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Permite tasta acasã inteligentã"
+msgstr "Activează tasta acasă inteligentă"
 
 #: src/nano.c:850
-#, fuzzy
 msgid "Save backups of existing files"
-msgstr "Creazã copii de siguranþã (backup) la salvare"
+msgstr "Salvează copii de rezervă ale fișierelor existente"
 
 #: src/nano.c:851
 msgid "-C <dir>"
-msgstr ""
+msgstr "-C <dir>"
 
 #: src/nano.c:851
-#, fuzzy
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[dir]"
+msgstr "--backupdir=<dir>"
 
 #: src/nano.c:852
-#, fuzzy
 msgid "Directory for saving unique backup files"
-msgstr "Director pentru scrierea fiºierelor copie-de-siguranþã (backup)"
+msgstr "Director pentru salvarea fișierelor unice copiid de rezervă"
 
 #: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Folosește bold în loc de textul video inversat"
 
 #: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Convertește tab-urile introduse în spații"
 
 #: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Activeazã bufere fiºier multiple"
+msgstr "Activează spații fișier multiple"
 
 #: src/nano.c:865
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Folosește fișiere de blocare în stilul vim"
 
 #: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Scrie în jurnal ºi citeºte istoria ºirurilor de cãutare/înlocuire"
+msgstr "Scrie în jurnal și citește istoria șirurilor de căutare/înlocuire"
 
 #: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Nu te uita la fiºierele nanorc"
+msgstr "Nu te uita la fișierele nanorc"
 
 #: src/nano.c:876
-#, fuzzy
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Reparã confuzia cu tastele Backspace/Delete"
+msgstr "Rezolvă problema de confuzie a tastelor numerice"
 
 #: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "Nu se adaugă linii noi la sfârșitul fișierelor"
 
 #: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Nu converti fiºierele din formatul DOS/Mac"
+msgstr "Nu converti fișierele din formatul DOS/Mac"
 
 #: src/nano.c:883
-#, fuzzy
 msgid "Use one more line for editing"
-msgstr "Foloseºte mai mult spaþiu pentru editare"
+msgstr "Se folosește încă o linie pentru editare"
 
 #: src/nano.c:886
-#, fuzzy
 msgid "Log & read location of cursor position"
-msgstr "Marcheazã textul la poziþia curentã a cursorului"
+msgstr "Scrie în jurnal & citește locația poziției cursorului"
 
 #: src/nano.c:889
 msgid "-Q <str>"
-msgstr ""
+msgstr "-Q <str>"
 
 #: src/nano.c:889
-#, fuzzy
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[ºir]"
+msgstr "--quotestr=<str>"
 
 #: src/nano.c:890
-#, fuzzy
 msgid "Quoting string"
-msgstr "ªir citate. implicit \"> \""
+msgstr "Text de citare"
 
 #: src/nano.c:892
 msgid "Restricted mode"
-msgstr "Mod restricþionat"
+msgstr "Mod restricționat"
 
 #: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Derulare prin linie în locul jumătății de ecran"
 
 #: src/nano.c:897
-#, fuzzy
 msgid "-T <#cols>"
-msgstr "-T [#coloane]"
+msgstr "-T <#coloană>"
 
 #: src/nano.c:897
-#, fuzzy
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#coloane]"
+msgstr "--tabsize=<#număr>"
 
 #: src/nano.c:898
-#, fuzzy
 msgid "Set width of a tab to #cols columns"
-msgstr "Seteazã lãþimea unui tab în coloane ca #coloane"
+msgstr "Setează lungimea unui tab la #număr coloane"
 
 #: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Realizează o clipire rapidă a barei de stare"
 
 #: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Afiºeazã informaþii despre versiune ºi terminã"
+msgstr "Afișează informații despre versiune și termină"
 
 #: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Detectează limitele cuvântului mai exact"
 
 #: src/nano.c:909
 msgid "-Y <str>"
-msgstr ""
+msgstr "-Y <str>"
 
 #: src/nano.c:909
-#, fuzzy
 msgid "--syntax=<str>"
-msgstr "--syntax=[ºir]"
+msgstr "--syntax=<str>"
 
 #: src/nano.c:910
-#, fuzzy
 msgid "Syntax definition to use for coloring"
-msgstr "Definiþie sintaxã de folosit"
+msgstr "Definiția sintaxei de folosit pentru colorare"
 
 #: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Aratã continuu poziþia cursorului"
+msgstr "Arată continuu poziția cursorului"
 
 #: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Reparã confuzia cu tastele Backspace/Delete"
+msgstr "Repară confuzia cu tastele Backspace/Delete"
 
 #: src/nano.c:915
-#, fuzzy
 msgid "Show this help text"
-msgstr "Aratã acest mesaj"
+msgstr "Arată acest text de ajutor"
 
 #: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indent-eazã automatic liniile noi"
+msgstr "Indent-ează automatic liniile noi"
 
 #: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Taie de la cursor la sfârºitul liniei"
+msgstr "Decupează de la cursor până la sfârșitul liniei"
 
 #: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nu urma link-urile simbolice, scrie peste"
 
 #: src/nano.c:924
-#, fuzzy
 msgid "Enable the use of the mouse"
-msgstr "Permite maus"
+msgstr "Activează folosirea mouse-ului"
 
 #: src/nano.c:926
 msgid "Do not read the file (only write it)"
-msgstr ""
+msgstr "Nu citi fișierul (doar scrie-l)"
 
 #: src/nano.c:928
 msgid "-o <dir>"
-msgstr ""
+msgstr "-o <dir>"
 
 #: src/nano.c:928
-#, fuzzy
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[dir]"
+msgstr "--operatingdir=<dir>"
 
 #: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Seteazã directorul de operare"
+msgstr "Setează directorul de operare"
 
 #: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Conservã tastele XON (^Q) ºi XOFF (^S)"
+msgstr "Conservă tastele XON (^Q) și XOFF (^S)"
 
 #: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignoră silențios problemele la pornire cum ar fi fișierul rc"
 
 #: src/nano.c:938
-#, fuzzy
 msgid "-r <#cols>"
-msgstr "-r [#coloane]"
+msgstr "-r <#coloană>"
 
 #: src/nano.c:938
-#, fuzzy
 msgid "--fill=<#cols>"
-msgstr "--fill=[#coloane]"
+msgstr "--fill=<#număr>"
 
 #: src/nano.c:939
 msgid "Set hard-wrapping point at column #cols"
-msgstr ""
+msgstr "Setează punctul de rupere permanentă la coloana #număr"
 
 #: src/nano.c:942
-#, fuzzy
 msgid "-s <prog>"
-msgstr "-s [prog]"
+msgstr "-s <prog>"
 
 #: src/nano.c:942
-#, fuzzy
 msgid "--speller=<prog>"
-msgstr "--speller=[prog]"
+msgstr "--speller=<prog>"
 
 #: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Permite corector ortografic alternativ"
+msgstr "Activează corectorul ortografic alternativ"
 
 #: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Salveazã automat la ieºire, nu întreba"
+msgstr "Salvează automat la ieșire, nu întreba"
 
 #: src/nano.c:947
-#, fuzzy
 msgid "View mode (read-only)"
-msgstr "Mod vedere (numai citire)"
+msgstr "Mod vizualizare (doar citire)"
 
 #: src/nano.c:949
-#, fuzzy
 msgid "Don't hard-wrap long lines"
-msgstr "Nu sparge (wrap) liniile lungi"
+msgstr "Nu strânge permanent liniile lungi"
 
 #: src/nano.c:951
-#, fuzzy
 msgid "Don't show the two help lines"
-msgstr "Nu arãta fereastra de ajutor"
+msgstr "Nu arăta cele două linii de ajutor"
 
 #: src/nano.c:952
-#, fuzzy
 msgid "Enable suspension"
-msgstr "Permite suspendarea"
+msgstr "Activează suspendarea"
 
 #: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
+msgstr "Activează ruperea ușoară a liniei"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versiunea %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versiunea %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Opþiuni compilare:"
+" Opțiuni compilate:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Ne pare rãu, suportul pentru aceastã funcþie a fost deactivat"
+msgstr "Ne pare rău, suportul pentru această funcție a fost dezactivat"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
-msgstr ""
+msgstr "Nici un nume de fișier"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Salvez buferul modificat (RÃSPUNSUL \"Nu\" VA DISTRUGE SCHIMBÃRILE) ?"
+msgstr ""
+"Se salvează spațiul modificat? (prin răspunsul „Nu” se vor PIERDE "
+"modificările!) "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Nu s-a putut redeschide stdin din tastatură, ne pare rău\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Se citește din stdin, ^C pentru a abandona\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Am recepþionat SIGHUP sau SIGTERM\n"
+msgstr "Am recepționat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1303
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Folosiþi \"fg\" pentru a vã întoarce la nano"
+msgstr "Folosiți „fg” pentru a reveni la nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "activat"
+msgstr "activată"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
-msgstr "deactivat"
+msgstr "dezactivată"
 
-#: src/nano.c:1637 src/winio.c:1283
-#, fuzzy
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "Indicator (flag) necunoscut %s"
+msgstr "Comandă necunoscută"
 
-#: src/nano.c:1749
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:1754
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:2312 src/rcfile.c:1321
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Dimensiune tab cerutã %s invalidã"
+msgstr "Mărimea tab solicitată „%s” este nevalidă"
 
-#: src/nano.c:2376 src/rcfile.c:1246
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Dimensiune umplere cerutã %s invalidã"
+msgstr "Mărimea de umplere solicitată „%s” este nevalidă"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
-msgstr ""
+msgstr "Tastați „%s -h” pentru o listă de opțiuni disponibile.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
@@ -1824,94 +1797,93 @@ msgstr "Da"
 
 #: src/prompt.c:1076
 msgid "All"
-msgstr "Tot"
+msgstr "Toate"
 
 #: src/prompt.c:1081
 msgid "No"
 msgstr "Nu"
 
 #: src/rcfile.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Eroare în %s pe linia %d: "
+msgstr "Eroare în %s la linia %lu: "
 
 #: src/rcfile.c:196
-#, fuzzy, c-format
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argumentul %s are \" neterminat"
+msgstr "Argumentul „%s” are un \" neterminat"
 
-#
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "ªirurile regex trebuie sã înceapã ºi sfârºeascã cu un caracter \""
+msgstr "Șirurile regex trebuie să înceapă și să se termine cu caracterul \""
 
 #: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex incorect \"%s\": %s"
+msgstr "Regex incorect „%s”: %s"
 
 #: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Lipseºte nume sintaxã"
+msgstr "Lipsește nume sintaxă"
 
 #: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Sintaxa „none” este rezervată"
 
 #: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Sintaxa „default” nu trebuie să aibă extensii"
 
 #: src/rcfile.c:433
-#, fuzzy
 msgid "Missing key name"
-msgstr "Lipseºte nume sintaxã"
+msgstr "Lipsește numele tastei"
 
 #: src/rcfile.c:442 src/rcfile.c:453
 msgid "Key name is too short"
-msgstr ""
+msgstr "Numele tastei este prea scurt"
 
 #: src/rcfile.c:463
 msgid "Key name must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+msgstr "Numele tastei trebuie să înceapă cu „^”, „M” sau „F”"
 
 #: src/rcfile.c:472
 msgid "Must specify a function to bind the key to"
-msgstr ""
+msgstr "Trebuie specificată o funcție la care se asociază tasta"
 
 #. TRANSLATORS: Do not translate the word "all".
 #: src/rcfile.c:482
 msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Trebuie specificat un meniu (sau „all“) în care se asociază/anulează tasta"
 
 #: src/rcfile.c:489
 #, c-format
 msgid "Cannot map name \"%s\" to a function"
-msgstr ""
+msgstr "Imposibil de mapat numele „%s“ la o funcție"
 
 #: src/rcfile.c:496
 #, c-format
 msgid "Cannot map name \"%s\" to a menu"
-msgstr ""
+msgstr "Imposibil de mapat numele „%s“ la un meniu"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
-msgstr ""
+msgstr "Funcția „%s“ nu există în meniul „%s“"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
-msgstr ""
+msgstr "Ne pare rău, tasta „%s“ nu poate fi reasociată"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:629
+#, c-format
 msgid "Error expanding %s: %s"
-msgstr "Eroare citind %s: %s"
+msgstr "Eroare la extinderea %s: %s"
 
-#: src/rcfile.c:668
-#, fuzzy, c-format
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1919,439 +1891,424 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Culoare %s incorectã.\n"
-"Culori valide sunt \"green\"(verde), \"red\"(roºu), \"blue\"(albastru), \n"
-"\"white\"(alb), \"yellow\"(galben), \"cyan\", \"magenta\"(purpuriu) ºi \n"
-"\"black\"(negru), cu prefixul opþional \"bright\"(strãlucitor) \n"
-"pentru culorile de scriere."
-
-#: src/rcfile.c:690
-#, fuzzy
+"Culoarea „%s“ nu a fost înțeleasă.\n"
+"Culorile valide sunt „verde“, „roșu“, „albastru“,\n"
+"„alb“, „galben“, „bleu“, „magenta“ și\n"
+"„negru“, cu prefixul opțional „bright“\n"
+"pentru culorile de fundal."
+
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat o comandă de culoare fără o comandă de sintaxă"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Lipseºte nume culoare"
+msgstr "Lipsește numele culorii"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
-msgstr ""
+msgstr "Lipsește șirul regex"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" necesitã un \"end=\" corespunzãtor"
+msgstr "\"start=\" necesită un \"end=\" corespunzător"
 
-#: src/rcfile.c:833
-#, fuzzy, c-format
+#: src/rcfile.c:837
+#, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Culoarea de fundal %s nu poate fi strãlucitoare"
+msgstr "Culoarea de fundal „%s“ nu poate fi bright"
 
-#: src/rcfile.c:861
-#, fuzzy
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat un antet de regex fără o comandă de sintaxă"
 
-#: src/rcfile.c:917
-#, fuzzy
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat un șir magic de regex fără o comandă de sintaxă"
 
-#: src/rcfile.c:922
-#, fuzzy
+#: src/rcfile.c:926
 msgid "Missing magic string name"
-msgstr "Lipseºte nume culoare"
+msgstr "Lipsește numele șiului magic"
 
-#: src/rcfile.c:981
-#, fuzzy
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat o analiză statică fără o comandă sintaxă"
 
-#: src/rcfile.c:986
-#, fuzzy
+#: src/rcfile.c:990
 msgid "Missing linter command"
-msgstr "Lipseºte nume culoare"
+msgstr "Comanda de analiză statică lipsește"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat utilitarul de formatare fără o comandă de sintaxă"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr ""
+msgstr "Lipsește comanda utilitarului de formatare"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
+"Eroare fatală: nu este asociată nici o tastă pentru funcția „%s”. Ieșire.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Dacă este nevoie, folosiți nano cu opțiunea -I pentru a ajusta setările "
+"voastre nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
-msgstr ""
+msgstr "Nu s-a putut găsi sintaxa „%s” pentru extindere"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Comanda „%s” nu este permisă într-un fișier inclus"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Sintaxa „%s” nu are comenzi de colorare"
 
-#: src/rcfile.c:1167
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Comanda %s nu a fost înþeleasã"
+msgstr "Comanda „%s” nu a fost înțeleasă"
 
-#: src/rcfile.c:1182
-#, fuzzy
+#: src/rcfile.c:1186
 msgid "Missing option"
-msgstr "Lipseºte nume culoare"
+msgstr "Lipsește opțiunea"
 
-#: src/rcfile.c:1204
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Opþiunea %s necesitã un argument"
+msgstr "Opțiunea „%s” necesită un argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Opțiunea nu este un șir valid multioctet"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
-#, fuzzy
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Sunt necesare douã caractere non-tab ºi non-spaþiu"
+msgstr "Sunt necesare caractere care nu sunt goale"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Sunt necesare douã caractere de o singurã coloanã"
+msgstr "Sunt necesare două caractere (mono coloană)"
 
-#: src/rcfile.c:1335
-#, fuzzy, c-format
+#: src/rcfile.c:1339
+#, c-format
 msgid "Cannot unset option \"%s\""
-msgstr "Nu pot de-seta indicatorul (flag) %s"
+msgstr "Imposibil de dezactivat opțiunea „%s”"
 
-#: src/rcfile.c:1341
-#, fuzzy, c-format
+#: src/rcfile.c:1345
+#, c-format
 msgid "Unknown option \"%s\""
-msgstr "Indicator (flag) necunoscut %s"
+msgstr "Opțiune „%s” necunoscută"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Nu pot gãsi directorul meu home!  Uãu!"
+msgstr "Nu pot găsi directorul meu home!  Uau!"
 
-#: src/rcfile.c:1438
-#, fuzzy, c-format
+#: src/rcfile.c:1442
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Apãsaþi Return/Enter pentru a continua lansarea nano\n"
+"Apăsați Enter pentru a continua pornirea nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" nu a fost gãsit"
+msgstr "„%.*s%s” nu a fost găsit"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
-msgstr " [Case Sensitive]"
+msgstr " [Sensibil la majuscule]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
-msgstr " [Înapoi]"
+msgstr " [ÃŽnapoi]"
 
-#
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (de înlocuit) în selecþie"
+msgstr " (de înlocuire) în selecție"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (de înlocuit)"
+msgstr " (de înlocuire)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Înlocuieºte în acest caz?"
+msgstr "Se înlocuiește această apariție?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Înlocuieºte cu"
+msgstr "Se înlocuiește cu"
 
-#: src/search.c:993
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Am înlocuit în %ld loc"
-msgstr[1] "Am înlocuit în %ld locuri"
+msgstr[0] "S-a înlocuit %lu apariție"
+msgstr[1] "S-au înlocuit %lu apariții"
+msgstr[2] "S-au înlocuit %lu de apariții"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
-#, fuzzy
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Introduceþi numãrul liniei"
+msgstr "Introduceți numărul liniei, numărul coloanei"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "Număr de linie sau coloană nevalid"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "Nu este o parantezã"
+msgstr "Nu este o paranteză"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "Nici o parantezã pereche"
+msgstr "Nu am găsit o paranteză pereche"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Marcaj Setare"
+msgstr "Marcaj aplicat"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "Marcaj DEsetare"
+msgstr "Marcaj ridicat"
 
 #: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nici o operație de anulat!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate găsi o potrivire pentru linia %d. Vă rugăm să "
+"salvați fișierul."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "adăugare de text"
 
 #: src/text.c:467 src/text.c:612
-#, fuzzy
 msgid "text delete"
-msgstr "Fiºier urmãtor"
+msgstr "ștergere de text"
 
 #: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "fuziune de linii"
 
 #: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "decupare de text"
 
 #: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "lipire de text"
 
 #: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "linie nouă"
 
 #: src/text.c:528 src/text.c:672
-#, fuzzy
 msgid "text insert"
-msgstr "Linia urmãtoare"
+msgstr "inserare de text"
 
 #: src/text.c:549 src/text.c:665
-#, fuzzy
 msgid "text replace"
-msgstr " (de înlocuit)"
+msgstr "înlocuire de text"
 
 #: src/text.c:556 src/text.c:679 src/text.c:983
 msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+msgstr "Eroare internă: tip necunoscut. Vă rugăm să salvați fișierul."
 
 #: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acțiune anulată (%s)"
 
 #: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nimic de refăcut!"
 
 #: src/text.c:584
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
+"Eroare internă: nu se poate pregăti repetarea acțunilor. Vă rugăm să salvați "
+"fișierul."
 
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acțiune refăcută (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
-msgstr "Nu am putut crea pipe"
+msgstr "Nu am putut crea o țeavă"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Nu am putut fork"
+msgstr "Nu am putut crea un proces nou"
 
 #: src/text.c:969
 msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate pregăti acțiunea de lipire. Vă rugăm să salvați "
+"fișierul."
 
 #: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "ªir greºit pentru ghilimele %s: %s"
+msgstr "Șir greșit de citare %s: %s"
 
 #: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Nu pot De-Alinia!"
+msgstr "Acum este posibilă de-alinierea!"
 
 #: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "Editeazã o înlocuire"
+msgstr "Editează o înlocuire"
 
 #: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creez listã cuvinte ortografiate greºit, vã rog aºteptaþi..."
+msgstr "Se creează lista cuvintelor ortografiate greșit, vă rog așteptați..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
+msgstr "Nu am putut obține dimensiunea spațiului țeavă"
 
 #: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „spell”"
 
 #: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Eroare invocare \"sort -f\""
+msgstr "Eroare la apelarea „sort -f”"
 
 #: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Eroare invocare \"uniq\""
+msgstr "Eroare la apelarea „uniq”"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Am terminat verificarea ortografiei"
+msgstr "Verificarea ortografică s-a terminat"
 
-#: src/text.c:2757 src/text.c:3345
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „%s”"
 
-#: src/text.c:2889
-#, fuzzy
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
-msgstr "Invocã corectorul ortografic, dacã e disponibil"
+msgstr "Se apelează corectorul ortografic, vă rugăm așteptați"
 
-#: src/text.c:2906
-#, fuzzy, c-format
+#: src/text.c:2902
+#, c-format
 msgid "Spell checking failed: %s"
-msgstr "Verificarea ortografiei a eºuat: %s: %s"
+msgstr "Corectarea ortografică a eșuat: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Verificarea ortografiei a eºuat: %s: %s"
+msgstr "Verificarea ortografiei a eșuat: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
-msgstr ""
+msgstr "Nu este definit nici un analizor static pentru acest tip de fișiere!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
-msgstr ""
+msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
-msgstr ""
+msgstr "Se lansează analiza statică, vă rugăm așteptați"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
-msgstr ""
+msgstr "Comanda „%s” nu a produs nicio linie analizabilă"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
+"Acest mesaj este pentru fișierul nedeschis %s, se deschide într-un spațiu "
+"nou?"
 
-#: src/text.c:3209
-#, fuzzy
+#: src/text.c:3205
 msgid "At last message"
-msgstr "Aratã acest mesaj"
+msgstr "Ultimul mesaj"
 
-#: src/text.c:3214
-#, fuzzy
+#: src/text.c:3210
 msgid "At first message"
-msgstr "Aratã acest mesaj"
+msgstr "Primul mesaj"
 
-#: src/text.c:3255
-#, fuzzy
-msgid "Error: no linter defined"
-msgstr "Eroare în %s pe linia %d: "
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eroare: nu este definit niciun utilitar de formatare"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Finalizat"
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr ""
+msgstr "Se apelează utilitarul de formatare, vă rugăm așteptați"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Formatarea s-a finalizat"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr ""
+msgstr "%sCuvinte: %lu  Linii: %ld  Caractere: %lu"
 
-#: src/text.c:3446
-#, fuzzy
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Adaugã Selecþie la fiºier"
+msgstr "În selecție:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
-msgstr "Intrare identicã"
+msgstr "Intrare Verbatim"
 
 #: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano a epuizat memoria!"
+msgstr "nano nu mai are memorie!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
 #: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Intrare Unicode"
 
-#
 #: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificat"
 
-#
 #: src/winio.c:2143
 msgid "View"
 msgstr "Vedere"
@@ -2362,19 +2319,21 @@ msgstr "DIR:"
 
 #: src/winio.c:2164
 msgid "File:"
-msgstr "Fiºier:"
+msgstr "Fișier:"
 
 #. TRANSLATORS: Try to keep this at most 76 characters.
 #: src/winio.c:2261
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
+"Avertizare: Modificare a unui fișier deblocat. Verificați permisiunile "
+"directorului?‎‬"
 
 #: src/winio.c:3377
-#, fuzzy, c-format
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
-"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%ld (%d%%)"
+"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%lu (%d%%)"
 
 #: src/winio.c:3507
 msgid "The nano text editor"
@@ -2386,19 +2345,19 @@ msgstr "versiune"
 
 #: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Adus pentru d-voastrã de:"
+msgstr "Prezentat de:"
 
 #: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "Mulþumiri speciale lui:"
+msgstr "Mulțumiri speciale pentru:"
 
 #: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation"
+msgstr "Fundația Free Software"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "traducătorilor cei mulți și pentru TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2406,132 +2365,13 @@ msgstr "Pentru ncurses:"
 
 #: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "ºi oricine altcineva a fost uitat..."
+msgstr "și oricine altcineva a fost uitat..."
 
 #: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Vã mulþumim cã folosiþi nano!"
-
-#~ msgid "Direction"
-#~ msgstr "Direcþie"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Invocã meniul de ajutor"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Cautã un anumit text în editor"
-
-#~ msgid "Move to the previous screen"
-#~ msgstr "Du-te la ecranul precedent"
+msgstr "Vă mulțumim că folosiți nano!"
 
-#~ msgid "Move to the next screen"
-#~ msgstr "Du-te la ecraul urmãtor"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Înlocuieºte textul din editor"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Gãseºte cealaltã parantezã"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr ""
-#~ "Executã cãutarea/înlocuirea curentã indiferentã/senzitivã la mãrimea "
-#~ "literelor"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Executã cãutarea/înlocuirea curentã spre înapoi"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Pre-adaugã la fiºierul curent"
-
-#~ msgid "Back up original file when saving"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Creazã copie de siguranþã (backup) pentru fiºierul original la salvare"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "Insereazã în bufer nou"
-
-#~ msgid "Find Other Bracket"
-#~ msgstr "Gãseºte cealaltã parantezã"
-
-#~ msgid "Insert File"
-#~ msgstr "Insereazã fiºier"
-
-#~ msgid "Auto line wrap"
-#~ msgstr "Trecere automatã (wrap) la linie nouã"
-
-#~ msgid ""
-#~ "\n"
-#~ "Buffer not written to %s (too many backup files?)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Buferul nu a fost scris în %s (prea multe fiºiere copii de siguranþã "
-#~ "<backup>?)\n"
-
-#~ msgid "Up"
-#~ msgstr "Sus"
-
-#~ msgid "Space"
-#~ msgstr "Spaþiu"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [opþiune GNU lungã] [opþiune] [fiºier]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [opþiune] [fiºier]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+LINIE"
-
-#~ msgid "-E [dir]"
-#~ msgstr "-E [dir]"
-
-#~ msgid "Use more space for editing"
-#~ msgstr "Foloseºte mai mult spaþiu pentru editare"
-
-#~ msgid "-Q [str]"
-#~ msgstr "-Q [sir]"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Executã cãutãri cu expresii regulare"
-
-#~ msgid "-Y [str]"
-#~ msgstr "-Y [ºir]"
-
-#~ msgid "-o [dir]"
-#~ msgstr "-o [dir]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Seteazã coloane de umplere (sparge/wrap linii la) #coloane"
-
-#~ msgid "(ignored, for Pico compatibility)"
-#~ msgstr "(ignorat, pentru compatibilitate cu Pico)"
-
-#~ msgid "Could not pipe"
-#~ msgstr "Nu am putut pipe"
-
-#~ msgid "Verbatim input"
-#~ msgstr "Intrare identicã"
-
-#~ msgid "Could not invoke \"%s\""
-#~ msgstr "Nu am putut invoca \"%s\""
-
-#~ msgid "Missing flag"
-#~ msgstr "Lipseºte indicator (flag)"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Haideþi, fiþi rezonabil"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Refuz potrivire regex de lungime 0"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Nu pot deschide \"%s\": %s"
+#~ "Eroare internă: nu se poate găsi o potrivire pentru linia %ld. Vă rugăm "
+#~ "să salvați fișierul."
diff --git a/po/ru.po b/po/ru.po
index 93a73c6a913f969dc0cd21086a8367db539fe3ef..57cae74adb90670c540dc6d050a8ea14dcc9c231 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-05-27 08:39+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -28,8 +28,8 @@ msgid "Go To Directory"
 msgstr "К каталогу"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
@@ -41,7 +41,7 @@ msgstr "Не удаётся выйти за границы %s в огранич
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтения %s: %s"
@@ -63,20 +63,20 @@ msgid "(parent dir)"
 msgstr "(вверх)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Поиск"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Поиск завёрнут"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Это единственное совпадение"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Нечего искать"
 
@@ -243,12 +243,12 @@ msgstr "Новый файл"
 msgid "\"%s\" not found"
 msgstr "Файл «%s» не найден"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Файл «%s» является каталогом"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Файл «%s» является файлом устройства"
@@ -310,8 +310,8 @@ msgstr "Слишком много резервных файлов?"
 msgid "Error writing %s: %s"
 msgstr "Ошибка записи %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка записи временного файла: %s"
@@ -1673,16 +1673,16 @@ msgid "Enable soft line wrapping"
 msgstr "Включить мягкий перенос строк"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano версия %s (собрано %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Эл. почта: nano@nano-editor.org\tСайт: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1691,67 +1691,67 @@ msgstr ""
 "\n"
 " Параметры сборки:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Поддержка этой функции была отключена"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Сохранить изменённый буфер? (ИНАЧЕ ВСЕ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ)"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не удалось повторно открыть стандартный ввод с клавиатуры\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Чтение из стандартного ввода. ^C для прерывания\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Используйте «fg» для возврата в nano\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Неизвестная команда"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON проигнорирован, мр-бр-бр"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проигнорирован, мр-бр-бр"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табуляции «%s» не подходит"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнения «%s» не подходит"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введите «%s -h» для получения списка доступных опций.\n"
@@ -1793,8 +1793,8 @@ msgstr "Ошибка в позиции %s строки %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регулярных выражений должны начинаться и заканчиваться символом \""
@@ -1849,22 +1849,22 @@ msgstr "Не удалось сопоставить имя «%s» к функци
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не удалось сопоставить имя «%s» к меню"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Привязка «%s» не может быть переназначена"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Ошибка расширения %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1879,63 +1879,63 @@ msgstr ""
 "«black», с необязательным префиксом «bright»\n"
 "для цвета фона."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не удаётся добавить команду цвета без команды синтаксиса"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Отсутствует название цвета"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Отсутствует регулярное выражение"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» требует соответствующего «end=»"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Цвет фона «%s» не может быть светлым"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не удаётся добавить рег. выражение заголовка без команды синтаксиса"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Не удаётся добавить магическое рег. выражение без команды синтаксиса"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Отсутствует магическая строка"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Отсутствует команда анализатора синтаксиса"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Не удаётся добавить анализатор синтаксиса без команды синтаксиса"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Отсутствует команда анализатора синтаксиса"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Критическая ошибка: для функции «%s» не назначены клавиши.  Выхожу.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1943,62 +1943,62 @@ msgstr ""
 "Используйте nano с опцией -I, если требуется подстроить параметры вашего "
 "nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не удалось сопоставить имя «%s» к расширению"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Команда «%s» не разрешена во включенном файле"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Непонятная команда «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Параметр отсутствует "
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опция «%s» требует аргумент"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опция не правильная многобайтовая строка"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Требуется не пустой символ"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Требуется два однострочных символа"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не удалось снять опцию «%s»"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Неизвестная опция «%s»"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Не могу найти собственную домашнюю директорию! Йой!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2013,38 +2013,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» не найден"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [С учётом регистра]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [РегВыр]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (что менять) в выделении"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (что менять)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Заменить это вхождение?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Заменить на"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2053,19 +2053,19 @@ msgstr[1] "Замененные %lu вхождения"
 msgstr[2] "Заменено %lu вхождений"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Введите номер строки и столбца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Неправильный номер строки или столбца"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Не скобка"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Нет соответствующей скобки"
 
@@ -2081,9 +2081,9 @@ msgstr "Метка снята"
 msgid "Nothing in undo buffer!"
 msgstr "Буфер отмены действий пуст!"
 
-#: src/text.c:445
-#, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу."
 
@@ -2138,23 +2138,17 @@ msgstr ""
 "Внутренняя ошибка: ошибка настройки повторения изменения. Сохраните свою "
 "работу."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Внутренняя ошибка: не удаётся сопоставить строку %d. Сохраните свою работу."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторённое действие (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Не удалось создать конвейер"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Не удалось создать дочерний процесс"
 
@@ -2180,7 +2174,7 @@ msgstr "Редактировать замену"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт создание списка ошибочных слов. Подождите..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не удалось получить размер буфера конвейера"
 
@@ -2196,88 +2190,88 @@ msgstr "Ошибка выполнения «sort -f»"
 msgid "Error invoking \"uniq\""
 msgstr "Ошибка выполнения «uniq»"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверка правописания завершена"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ошибка выполнения «%s»"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Запуск проверки орфографии, подождите"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правописания не удалась: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правописания не удалась: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Для данного типа файла не настроена программа проверки синтаксиса!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Сохранить измененный буфер перед проверкой?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Запуск проверки, подождите"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Получено 0 распознанных строк от комманды: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Это сообщение о не открытом файле %s, открыть его в новом буфере?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Последнее сообщение"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Первое сообщение"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Запуск проверки, подождите"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Ввод «как есть»"
 
diff --git a/po/sl.po b/po/sl.po
index 33668416eec3cb3206ff4351dfd1bbe9d3681f01..7c16537d20bd6f9c4f4331640760c0859a73a8d0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2013-03-18 21:33+0100\n"
 "Last-Translator: Klemen Košir <klemen913@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -27,8 +27,8 @@ msgid "Go To Directory"
 msgstr "Pojdi v mapo"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Preklicano"
 
@@ -40,7 +40,7 @@ msgstr "V omejenem načinu ni mogoče zapustiti %s"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Napaka med branjem %s: %s"
@@ -62,20 +62,20 @@ msgid "(parent dir)"
 msgstr "(nad. mapa)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Iskanje je ovito"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "To je edina pojavitev niza"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ni trenutnega vzorca iskanja"
 
@@ -258,12 +258,12 @@ msgstr "Nova datoteka"
 msgid "\"%s\" not found"
 msgstr "\"%s\" ni mogoče najti"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" je mapa"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je datoteka naprave"
@@ -326,8 +326,8 @@ msgstr "Ali je preveč varnostnih kopij datotek?"
 msgid "Error writing %s: %s"
 msgstr "Napaka med pisanjem %s:%s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Napaka med pisanjem v začasno datoteko: %s"
@@ -1707,17 +1707,17 @@ msgid "Enable soft line wrapping"
 msgstr "Omogoči blage prelome vrstic"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano različica %s (kodno prevedena %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Elektronska pošta: nano@nano-editor.org\tSplet: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1726,69 +1726,69 @@ msgstr ""
 "\n"
 " Kodno prevedene možnosti:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Žal je podpora za to funkcijo onemogočena"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Ali naj se spremembe datoteke shranijo (z odgovorom \"Ne\" bodo SPREMEMBE "
 "IZGUBLJENE)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Na žalost ni bilo mogoče ponovno odpreti stdin s tipkovnice\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Branje iz stdin, ^C za prekinitev\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Za vrnitev v nano uporabite \"fg\".\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "omogočeno"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "onemogočeno"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Neznan ukaz"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON je prezrt, mumble mumble"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF je prezrt, mumble mumble"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1830,8 +1830,8 @@ msgstr "Napaka v %s v vrstici %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' ima neuničen \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Nizi logičnega izraza se morajo začeti in končati z znakom \""
 
@@ -1885,22 +1885,22 @@ msgstr "Ni mogoče preslikati imena \"%s\" k funkciji"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "Napaka med branjem %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1915,64 +1915,64 @@ msgstr ""
 "\"black\", z neobvezno predpono \"bright\"\n"
 "za osprednje barve."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Manjka niz logičnega izraza"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" potrebuje ustrezen \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Barva ozadja \"%s\" ne more biti svetla"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Ni mogoče dodati logičnega izraza glave brez ukaza skladnje"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Ni mogoče dodati logičnega izraza čarobnega niza brez ukaza skladnje"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Manjka ime čarobnega niza"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Ni mogoče dodati logičnega izraza glave brez ukaza skladnje"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Ni mogoče dodati ukaza barve brez ukaza skladnje"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Usodna napaka: nobenih tipk ni preslikanih za funkcijo \"%s\""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1980,63 +1980,63 @@ msgstr ""
 "Poteka končanje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
 "nano z možnostjo -I.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Ni mogoče preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ukaz \"%s\" ni dovoljen v vključeni datoteki"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladnja \"%s\" nima ukazov barv"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ukaz \"%s\" ni razumljiv"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Možnost \"%s\" zahteva argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Možnost ni veljaven večbajtni niz"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Zahtevani so ne-prazni znaki"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Potrebna sta dva enostolpčna znaka"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Ni mogoče ponastaviti zastavice \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "Neznana zastavica \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ni mogoče najti domače mape!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2051,38 +2051,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ni mogoče najti"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (za zamenjavo) v izbor"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (za zamenjavo)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ali naj se primerek zamenja?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Zamenjaj z"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2092,19 +2092,19 @@ msgstr[2] "Zamenjani sta %lu pojavitvi"
 msgstr[3] "Zamenjane so %lu pojavitve"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Vnesite Å¡tevilko vrstice, Å¡tevilko stolpca"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Neveljavna Å¡tevilka vrstice ali stolpca"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ni oklepaj"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ni ujemajočega oklepaja"
 
@@ -2120,9 +2120,9 @@ msgstr "Označba je ponastavljena"
 msgid "Nothing in undo buffer!"
 msgstr "Ničesar ni v medpomnilniku razveljavitve!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Notranja napaka: ni mogoče primerjati vrstice %d. Shranite svoje delo."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2176,22 +2176,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Notranja napaka: ni mogoče nastaviti preklica izreza. Shranite svoje delo."
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Notranja napaka: ni mogoče primerjati vrstice %d. Shranite svoje delo."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Uveljavljeno dejanje (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Ni mogoče ustvariti cevi"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Ni mogoče razvejiti"
 
@@ -2218,7 +2213,7 @@ msgstr "Uredi zamenjavo"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Ustvarjanje napačno črkovanega seznama besed, počakajte ..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Ni mogoče pridobiti velikosti medpomnilnika cevi"
 
@@ -2234,91 +2229,91 @@ msgstr "Napaka pri priklicu \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Napaka pri priklicu \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Končano preverjanje črkovanja"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Napaka pri priklicu \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Vključi črkovalnik, če je na voljo"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Preverjanje črkovanja je spodletelo: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "Ne dodajaj novih vrstic na konec datotek"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Pokaži to sporočilo"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "V izboru:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Natančni vnos"
 
diff --git a/po/sr.po b/po/sr.po
index 933b14ae2bf95bc8e841f23c4a9a4059abc03377..1faa4ca5b3349e2eff1b20f2673223e87cc53d0d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-09-13 12:15+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отказано"
 
@@ -37,7 +37,7 @@ msgstr "Не могу да идем ван „%s“ у ограниченом р
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при читању „%s“: %s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr "(главни дир)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Тражи"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Тражи у круг"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ово је једина појава"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Нема шаблона текуће претраге"
 
@@ -238,12 +238,12 @@ msgstr "Нова датотека"
 msgid "\"%s\" not found"
 msgstr "Нисам нашао „%s“"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ је датотека уређаја"
@@ -306,8 +306,8 @@ msgstr "Превише резервних датотека?"
 msgid "Error writing %s: %s"
 msgstr "Грешка приликом писања „%s“: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка писања привремене датотеке: %s"
@@ -1668,16 +1668,16 @@ msgid "Enable soft line wrapping"
 msgstr "Укључује меко преламање редова"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " Гнуов нано издање %s (изграђено %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Ел. пошта: nano@nano-editor.org\tВеб: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1686,67 +1686,67 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Нажалост, подршка за ову функцију је искључена"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Нема назива датотеке"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Да сачувам измењену међумеморију (ОДГОВОР „Не“ ЋЕ ОДБАЦИТИ ИЗМЕНЕ) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не могу поново да отворим стандардни улаз са тастатуре, извините\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Читам са стандардног улаза, ^C да прекинете\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Користите „fg“ да се вратите у нано.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "искључено"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Непозната наредба"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON је занемарен, јао мени"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF је занемарен, јао мени"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Тражена величина табулатора %s је неисправна"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Тражена величина попуне %s је неисправна"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Укуцајте „%s -h“ за списак доступних опција.\n"
@@ -1788,8 +1788,8 @@ msgstr "Грешка у %s у %lu. реду: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент „%s“ садржи недовршени знак \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Ниске регуларних израза морају почети и завршити се знаком \""
 
@@ -1841,22 +1841,22 @@ msgstr "Не могу да мапирам назив „%s“ ка функци
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Не могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Функција „%s“ не постоји у изборнику „%s“"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Извините, ниска тастера „%s“ не може бити поново свезана"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Грешка ширења „%s“: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1872,63 +1872,63 @@ msgstr ""
 "„black“ (црна), са необавезним предметком „bright“ (светло)\n"
 "за боје позадине."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не могу да додам наредбу боје без наредбе синтаксе"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Недостаје назив боје"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Недостаје ниска регуларног израза"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Боја позадине „%s“ не може бити светла"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не могу да додам регуларни израз заглавља без наредбе синтаксе"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Не могу да додам регуларни израз чаробне ниске без наредбе синтаксе"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Недостаје назив чаробне ниске"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Не могу да додам чистача без наредбе синтаксе"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Недостаје наредба чистача"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Не могу да додам чистача без наредбе синтаксе"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Недостаје наредба чистача"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Кобна грешка: нема мапираних тастера за функцију „%s“.  Излазим.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1936,62 +1936,62 @@ msgstr ""
 "Ако је потребно, користите нано са опцијом „-I“ да дотерате ваша подешавања "
 "нанорц-а\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не могу да нађем синтаксу „%s“ за ширење"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Наредба „%s“ није дозвољена у укљученој датотеци"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтакса „%s“ нема наредбе боје"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Нисам разумео наредбу „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Недостаје опција"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опција није исправна вишебитна ниска"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Потребни су не-празни знаци"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Потребна су два знака једног-ступца"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Не могу да расподесим опцију „%s“"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Непозната опција „%s“"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2006,38 +2006,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "Нисам нашао „%.*s%s“"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [разл. величину слова]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [рег. израз]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [уназад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (за замену) у избору"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за замену)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Да заменим ову појаву?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замени са"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2046,19 +2046,19 @@ msgstr[1] "Замених %lu појаве"
 msgstr[2] "Замених %lu појава"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Унесите број реда, број ступца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Неисправан број реда или ступца"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Није заграда"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Нема одговарајуће заграде"
 
@@ -2075,11 +2075,11 @@ msgstr "Поништена ознака"
 msgid "Nothing in undo buffer!"
 msgstr "Нема ничега у међумеморији поништавања!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Унутрашња грешка: не могу да поклопим %ld. ред.  Молим сачувајте ваш рад."
+"Унутрашња грешка: не могу да поклопим %d. ред.  Молим сачувајте ваш рад."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2131,23 +2131,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Унутрашња грешка: не могу да поставим повраћај.  Молим сачувајте ваш рад."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Унутрашња грешка: не могу да поклопим %d. ред.  Молим сачувајте ваш рад."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Не могу да направим спојку"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Не могу да расцепим"
 
@@ -2174,7 +2168,7 @@ msgstr "Измените замену"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Правим списак погрешно унетих речи, сачекајте..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не могу да добавим величину међумеморије спојке"
 
@@ -2190,90 +2184,90 @@ msgstr "Грешка при покретању „sort -f“-а"
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Завршио сам проверу правописа"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при покретању „%s“-а"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Призивам проверу правописа, сачекајте мало"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Провера правописа није успела: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Провера правописа није успела: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Чистач није одређен за ову врсту датотеке!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Да сачувам измењену међумеморију пре чишћења?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Призивам чистача, сачекајте мало"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Добих 0 обрадивих редова од наредбе: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Ова порука је за неотворену датотеку „%s“, да је отворим у новој "
 "међумеморији?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "На последњу поруку"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "На прву поруку"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Призивам чистача, сачекајте мало"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sРечи: %lu  Редова: %ld  Знакова: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "У избору:"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Улаз дословности"
 
@@ -2352,6 +2346,10 @@ msgstr "и свима осталима које смо пропустили..."
 msgid "Thank you for using nano!"
 msgstr "Хвала вам што користите нано!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Унутрашња грешка: не могу да поклопим %ld. ред.  Молим сачувајте ваш рад."
+
 #~ msgid "line wrap"
 #~ msgstr "прелом реда"
 
diff --git a/po/sv.po b/po/sv.po
index 5bdd25792df098f588ee0e63e1d3e1f337a451e9..f0e133dd7412164672fb5ded57eee2740a19f3d9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2014-12-25 00:11+0100\n"
 "Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -26,8 +26,8 @@ msgid "Go To Directory"
 msgstr "GÃ¥ till katalog"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -39,7 +39,7 @@ msgstr "Kan inte gå utanför %s i begränsat läge"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fel vid inläsning av %s: %s"
@@ -61,20 +61,20 @@ msgid "(parent dir)"
 msgstr "(föräldkat)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Sök"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Sökningen började om från början"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Detta är enda förekomsten"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Inget aktuellt sökmönster"
 
@@ -224,12 +224,12 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" är en katalog"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" är en enhetsfil"
@@ -292,8 +292,8 @@ msgstr "För många säkerhetskopierade filer?"
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
@@ -1657,16 +1657,16 @@ msgid "Enable soft line wrapping"
 msgstr "Aktivera mjuk radbrytning"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompilerad %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHemsida: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1675,68 +1675,68 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tyvärr, stöd för denna funktion har inaktiverats"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Inget filnamn"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunde inte återöppna stdin från tangentbordet\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Läser från stdin, ^C för att avbryta\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Okänt kommando"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorerades, mummel mummel"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorerades, mummel mummel"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Skriv ”%s -h” för en lista över tillgängliga flaggor.\n"
@@ -1778,8 +1778,8 @@ msgstr "Fel i %s på rad %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
 
@@ -1831,22 +1831,22 @@ msgstr "Kan inte mappa namnet ”%s” till en funktion"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan inte mappa namnet ”%s” till en meny"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "Funktionen ”%s”  existerar inte i meny ”%s”"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tangentnedtryckningen ”%s” kan inte bindas om"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Fel vid utökning av %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1861,67 +1861,67 @@ msgstr ""
 "\"cyan\", \"magenta\" och \"black\" (svart), med\n"
 "valfria prefixet \"bright\" (ljus) för förgrundsfärger."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Saknar sträng för reguljärt uttryck"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kräver ett motsvarande \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Kan inte lägga till ett reguljärt uttryck för huvud utan ett syntaxkommando"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Kan inte lägga till ett reguljärt uttryck för magisk sträng utan ett "
 "syntaxkommando"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Saknar namn på magisk sträng"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 #, fuzzy
 msgid "Missing formatter command"
 msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 "Allvarligt fel: Inga tangenter mappade för funktionen \"%s\". Avslutar.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1929,62 +1929,62 @@ msgstr ""
 "Om det behövs, använd nano med flaggan -I för att justera dina nanorc-"
 "inställningar.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Kunde inte hitta syntax %s att utöka"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Saknad flagga"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Flagga är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Kan inte bort flaggan \"%s\""
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Okänd flagga \"%s\""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1999,38 +1999,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" kunde inte hittas"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Skiftlägeskänslig]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Reguljärt uttryck]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Baklänges]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (att ersätta) i markering"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (att ersätta)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ersätta denna förekomst?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ersätt med"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2038,19 +2038,19 @@ msgstr[0] "Ersatte %lu förekomst"
 msgstr[1] "Ersatte %lu förekomster"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ogiltigt rad- eller kolumnnummer"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Inte en klammer"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
@@ -2066,10 +2066,10 @@ msgstr "Markera borttagen"
 msgid "Nothing in undo buffer!"
 msgstr "Inget i ångra-bufferten!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "Internt fel: Kan inte matcha rad %ld. Spara ditt arbete."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2120,22 +2120,17 @@ msgstr "Inget att göra om!"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "Internt fel: Kan inte göra om. Spara ditt arbete."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Gjorde om åtgärd (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Kunde inte skapa rör"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
@@ -2160,7 +2155,7 @@ msgstr "Redigera en ersättning"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Skapar lista över felstavade ord, var vänlig vänta…"
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde inte få tag i rörbuffertens storlek"
 
@@ -2176,88 +2171,88 @@ msgstr "Fel vid start av \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Starta stavningskontrollen"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Ingen felkontroll definierad för denna typ av fil!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Spara ändrad buffert före felkontroll?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Startar felkontroll, vänta."
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Fick 0 tolkningsbara rader från kommando: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr "Meddelandet är för oöppnade filen %s, öppna den i en ny buffer?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Vid sista meddelandet"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Vid första meddelandet"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 #, fuzzy
 msgid "Invoking formatter, please wait"
 msgstr "Startar felkontroll, vänta."
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Ordagrann inmatning"
 
@@ -2334,6 +2329,9 @@ msgstr "och alla andra som vi har glömt…"
 msgid "Thank you for using nano!"
 msgstr "Tack för att du använder nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Internt fel: Kan inte matcha rad %ld. Spara ditt arbete."
+
 #~ msgid "line wrap"
 #~ msgstr "radbryt"
 
diff --git a/po/tr.po b/po/tr.po
index 1f95b13d557692bb671a5f5d5cffcf9f56185c0a..236650e2683fd198c0c668f8bb9c907a99f816f7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2003-08-17 18:08+0300\n"
 "Last-Translator: A. Murat EREN <meren@comu.edu.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -25,8 +25,8 @@ msgid "Go To Directory"
 msgstr "Dizine Git"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Ä°ptal edildi"
 
@@ -38,7 +38,7 @@ msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
@@ -60,20 +60,20 @@ msgid "(parent dir)"
 msgstr ""
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ara"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Arama Döngülendi"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Bu tek bulgu"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
@@ -205,12 +205,12 @@ msgstr "Yeni Dosya"
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
@@ -274,8 +274,8 @@ msgstr ""
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -1715,16 +1715,16 @@ msgid "Enable soft line wrapping"
 msgstr ""
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "E-Posta: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1733,71 +1733,71 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Özür dileriz, bu işlev için destek etkisiz kılınmış"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Değiştirilmiş arabellek kaydedilsin mi (\"Hayır\" CEVABI TÜM DEĞİŞİKLİKLERİ "
 "YOK EDECEK) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "nano'ya geri dönmek için \"fg\"'yi kullanın"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON yoksayıldı."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF yoksayıldı."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "istenen Tab değeri %d geçerli değil"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri %d geçerli değil"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1839,8 +1839,8 @@ msgstr "%s'nin %d. satırında hata: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "%s argümanında sonlanmamış \" var"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Düzenli ifade katarları, \" karakteri ile başlamalı ve bitmeli\n"
@@ -1894,22 +1894,22 @@ msgstr ""
 msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1923,130 +1923,130 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" ve \n"
 "\"black\", seçimli \"bright\" ön eki ile.\n"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar."
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 #, fuzzy
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 #, fuzzy
 msgid "Missing magic string name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "%s başına ekleme için açılamıyor: %s"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "%s komutu anlaşılamadı"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "%s seçeneği bir bağımsız değişken gerektiriyor"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Üst pencere yeniden boyutlandırılamaz"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2061,59 +2061,59 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Büyük / Küçük Harfe Duyarlı]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [Düzenli İfade]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Geriye DoÄŸru]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (değiştirmek için)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Bu bulgu deÄŸiÅŸtirilsin mi?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ä°le deÄŸiÅŸtir"
 
-#: src/search.c:993
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d değiştirme yapıldı"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Satır numarasını girin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ayraç değil"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
@@ -2130,9 +2130,9 @@ msgstr "İşareti Kaldır"
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2187,22 +2187,17 @@ msgstr ""
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Boru yaratılamadı"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
@@ -2227,7 +2222,7 @@ msgstr "Bir yerdeğiştirmeyi düzenle"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz"
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
@@ -2243,92 +2238,91 @@ msgstr "\"sort -f\" çağırılırken hata"
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr ""
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "Bu mesajı gösterir"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "Bu mesajı gösterir"
 
-#: src/text.c:3255
-#, fuzzy
-msgid "Error: no linter defined"
-msgstr "%s'nin %d. satırında hata: "
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3446
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 205818cfa7dba5e97795e10d418bb6262d8abc15..2818f7ca04fb40e91efad6606e2ca0fc07445a38 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,13 +3,13 @@
 # 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.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-11 21:47+0300\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 12:19+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -26,8 +26,8 @@ msgid "Go To Directory"
 msgstr "Перейти до каталогу"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Скасовано"
 
@@ -39,7 +39,7 @@ msgstr "Не можу піти поза %s в обмеженому режимі"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Помилка під час спроби читання %s: %s"
@@ -61,21 +61,21 @@ msgid "(parent dir)"
 msgstr "(батьк. кат.)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Пошук"
 
 # message
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Дісталися кінця файла, почали спочатку"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Це єдиний збіг"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Немає поточного зразка для пошуку"
 
@@ -115,6 +115,8 @@ msgstr ""
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
+"Редагування файла %s вже виконується (%s за допомогою %s, PID %d); "
+"продовжити?"
 
 #: src/files.c:308
 #, c-format
@@ -243,12 +245,12 @@ msgstr "Новий файл"
 msgid "\"%s\" not found"
 msgstr "\"%s\" не знайдено"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» є каталогом"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» є файлом пристрою"
@@ -312,8 +314,8 @@ msgstr "Забагато файлів резервних копій?"
 msgid "Error writing %s: %s"
 msgstr "Помилка під час спроби записати %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Помилка під час спроби записати до тимчасового файла: %s"
@@ -779,9 +781,8 @@ msgid "Go to next linter msg"
 msgstr "Перейти до наступного повідомлення linter"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Викликати linter, якщо доступний"
+msgstr "Викликати formatter, якщо доступний"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -817,9 +818,8 @@ msgid "To Linter"
 msgstr "До linter"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "формат DOS"
+msgstr "Formatter"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -1679,15 +1679,15 @@ msgstr "Увімкнути м’яке перенесення рядків"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano версії %s (зібране %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano версії %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Ел. пошта: nano@nano-editor.org\tІнтернет: http://www.nano-editor.org"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1696,67 +1696,67 @@ msgstr ""
 "\n"
 " Зібрано з таким параметрами:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Вибачте, підтримку цієї функції вимкнено"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Немає назви файла"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Зберегти змінений буфер (Відповідь «Ні» СКАСУЄ ВСІ ЗМІНИ)? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Не вдалося повторно відкрити стандартний ввід з клавіатури\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Читання зі стандартного вводу. ^C для переривання\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Прийнято SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Використовуйте «fg» для повернення у nano\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "дозволено"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "заборонено"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Невідома команда"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON проігноровано, мр-бр-бр"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проігноровано, мр-бр-бр"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запитаний розмір табуляції «%s» не підходить"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запитаний некоректний розмір заповнення \"%s\""
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Введіть команду «%s -h», щоб отримати список доступних параметрів.\n"
@@ -1798,8 +1798,8 @@ msgstr "Помилка в %s на рядку %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Аргумент %s має незакриту \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Рядки регулярних виразів повинні починатися та закінчуватися лапками (\")"
@@ -1854,22 +1854,22 @@ msgstr "Не можна пов’язати назву «%s» з функціє
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "Неможливо пов’язати назву «%s» з меню"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr "У меню «%2$s» немає пункту «%1$s»"
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Вибачте, призначення «%s» змінювати не можна"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Помилка під час розгортання %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1884,64 +1884,62 @@ msgstr ""
 "«black», з необов’язковим  префіксом «bright»\n"
 "для кольору тла."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Не вдається додати команду кольору без команди синтаксису"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Відсутня назва кольору"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Не вказано регулярний вираз"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" потребує відповідного \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Колір тла \"%s\" не може бути світлим"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Не вдається додати рег. вираз заголовку без команди синтаксису"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Не вдалося додати формальний вираз контрольного рядка без команди синтаксису"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Не вистачає назви контрольного рядка"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Не можна додавати linter без команди синтаксису"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Не вистачає програми linter"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Не можна додавати linter без команди синтаксису"
+msgstr "Не можна додавати formatter без команди синтаксису"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Не вистачає програми linter"
+msgstr "Не вистачає програми formatter"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Критична помилка: з функцією «%s» не пов’язано клавіш. Виходимо.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1949,62 +1947,62 @@ msgstr ""
 "Якщо потрібно, скористайтеся nano з параметром -I, щоб скоригувати параметри "
 "у nanorc.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Не вдалося знайти синтаксичну конструкцію «%s» для розширення"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Команда \"%s\" не дозволена у включеному файлі"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтаксис \"%s\" не має колірних команд"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Не зрозуміла команда \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Пропущено параметр"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опція \"%s\" вимагає аргумент"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опція не є припустимим багатобайтовим рядком"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Вимагається непорожній символ"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Вимагається два одинарних символи"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Неможливо скасувати визначення параметра «%s»"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Невідомий параметр «%s»"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Я не можу знайти свою домівку! Жах!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -2019,38 +2017,38 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" не знайдено"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [РегЗалеж]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [ФормВир]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Назад]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (що змінювати) у позначеному"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (до заміни)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Замінити цей примірник?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замінити на"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -2059,19 +2057,19 @@ msgstr[1] "Замінено %lu збіги"
 msgstr[2] "Замінено %lu збігів"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Введіть номер рядка, номер ряду"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Неправильний номер рядка або стовпчика"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Не дужка"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Нема відповідної дужки"
 
@@ -2087,11 +2085,11 @@ msgstr "Мітку знято"
 msgid "Nothing in undo buffer!"
 msgstr "Буфер скасування дій порожній!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Внутрішня помилка: не вдалося встановити відповідність рядка %ld. Збережіть "
+"Внутрішня помилка: не вдалося встановити відповідність рядка %d. Збережіть "
 "результати вашої роботи."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2145,24 +2143,17 @@ msgstr ""
 "Внутрішня помилка: не вдалося налаштувати повторення дії. Збережіть "
 "результати вашої роботи."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr ""
-"Внутрішня помилка: не вдалося встановити відповідність рядка %d. Збережіть "
-"результати вашої роботи."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторена дія (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Не можу створити канал (pipe)"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Не можу зробити fork()"
 
@@ -2189,7 +2180,7 @@ msgstr "Редагувати заміну"
 msgid "Creating misspelled word list, please wait..."
 msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Не можу отримати розмір буферу каналу"
 
@@ -2205,90 +2196,89 @@ msgstr "Помилка виконання \"sort -f\""
 msgid "Error invoking \"uniq\""
 msgstr "Помилка виконання \"uniq\""
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Помилка виконання \"%s\""
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Викликаємо програму для пошуку друкарських помилок, зачекайте"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Перевірка орфографії не вдалася: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Не вдалось перевірити орфографію: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Для цього типу файлів не визначено обробника!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Зберегти змінений буфер перед обробкою?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Викликаємо linter, зачекайте"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Від команди отримано 0 придатних рядків: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Це повідомлення пов’язано із невідкритим файлом %s. Відкрити його у новому "
 "буфері?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "На останньому повідомленні"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "На першому повідомленні"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Помилка: не визначено formatter"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Завершено"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Викликаємо linter, зачекайте"
+msgstr "Викликаємо formatter, зачекайте"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Форматування завершено"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлів: %lu Рядків: %ld  Символів: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "У позначеному:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Буквальний ввід"
 
@@ -2353,7 +2343,7 @@ msgstr "The Free Software Foundation (Фонд Вільного Програмн
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "багатьом перекладачам та TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2367,6 +2357,11 @@ msgstr "та іншим, кого ми забули..."
 msgid "Thank you for using nano!"
 msgstr "Дякуємо за використання nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Внутрішня помилка: не вдалося встановити відповідність рядка %ld. "
+#~ "Збережіть результати вашої роботи."
+
 #~ msgid "line wrap"
 #~ msgstr "перенесення рядка"
 
diff --git a/po/vi.po b/po/vi.po
index f21fc1d254f782d02d44515b77160c843b2e0617..4408378295788c2f187ed24de9c0eeadfb6651a2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,17 +1,17 @@
 # Vietnamese translation for Nano.
 # Bản dịch tiếng Việt dành cho nano.
-# Copyright © 2014 Free Software Foundation, Inc.
+# Copyright © 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005, 2006.
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.5\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
-"PO-Revision-Date: 2014-07-12 08:53+0700\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 07:56+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -20,8 +20,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: LocFactoryEditor 1.8\n"
-"X-Poedit-SourceCharset: UTF-8\n"
 
 #. TRANSLATORS: This is a prompt.
 #: src/browser.c:203
@@ -29,8 +27,8 @@ msgid "Go To Directory"
 msgstr "Đi tới thư mục"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
@@ -42,7 +40,7 @@ msgstr "Không đi ra được bên ngoài của %s trong chế độ hạn ch
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Gặp lỗi khi đọc %s: %s"
@@ -61,23 +59,23 @@ msgstr "(thmục)"
 #. * characters.
 #: src/browser.c:632
 msgid "(parent dir)"
-msgstr "(th.mục cha)"
+msgstr "(thmục cha)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Tìm Toàn bộ"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Đây là lần xảy ra duy nhất"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Không có mẫu tìm kiếm hiện tại"
 
@@ -105,7 +103,7 @@ msgstr "Gặp lỗi khi xóa tập tin khóa %s: %s"
 #: src/files.c:272
 #, c-format
 msgid "Error opening lock file %s: %s"
-msgstr "Gặp lỗi khi mở tập tin khoá %s: %s"
+msgstr "Gặp lỗi khi mở tập tin khóa %s: %s"
 
 #: src/files.c:282
 #, c-format
@@ -116,7 +114,7 @@ msgstr "Gặp lỗi khi đọc tập tin khóa %s: Dữ liệu không đủ"
 #: src/files.c:297
 #, c-format
 msgid "File %s is being edited (by %s with %s, PID %d); continue?"
-msgstr ""
+msgstr "Tập tin %s đang được biên soạn (bởi %s bằng %s, PID %d); tiếp tục?"
 
 #: src/files.c:308
 #, c-format
@@ -145,7 +143,7 @@ msgstr "Bộ nhớ đệm mới"
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Đọc %lu dòng (Đã chuyển đổi từ định dạng DOS và Mac)"
+msgstr[0] "Đọc %lu dòng (Được chuyển đổi từ định dạng DOS và Mac)"
 
 #: src/files.c:879
 #, c-format
@@ -199,7 +197,7 @@ msgstr[0] "Đọc %lu dòng"
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "Đọc %lu dòng (Cảnh báo: không có quyền ghi)"
+msgstr[0] "Đọc %lu dòng (Cảnh báo: Không có quyền ghi)"
 
 #: src/files.c:943 src/files.c:980
 msgid "Reading File"
@@ -214,12 +212,12 @@ msgstr "Tập tin mới"
 msgid "\"%s\" not found"
 msgstr "Không tìm thấy “%s”"
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "“%s” là một thư mục"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "“%s” là một tập tin thiết bị"
@@ -251,8 +249,8 @@ msgstr "Phím không hợp lệ trong chế độ khác đa bộ đệm"
 #: src/files.c:1622
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
-"Ghi tệp tin sao lưu dự phòng gặp lỗi, tiếp tục ghi? (Gõ N nếu không chắc "
-"chắn)"
+"Ghi tập tin sao lưu dự phòng gặp lỗi, tiếp tục ghi? (Gõ N hay K nếu không "
+"chắc chắn)"
 
 #: src/files.c:1746
 #, c-format
@@ -283,8 +281,8 @@ msgstr "Quá nhiều tập tin sao lưu dự phòng?"
 msgid "Error writing %s: %s"
 msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Gặp lỗi khi ghi tập tin tạm thời: %s"
@@ -317,7 +315,7 @@ msgstr "Thêm lựa chọn vào sau Tập tin"
 
 #: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Ghi nhớ lựa chọn vào một tập tin"
+msgstr "Lưu lựa chọn vào một tập tin"
 
 #: src/files.c:2294
 msgid "File Name to Prepend to"
@@ -329,7 +327,7 @@ msgstr "Tên tập tin để thêm vào sau"
 
 #: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Tên tập tin để ghi nhớ"
+msgstr "Tên tập tin dùng để ghi vào"
 
 #: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
@@ -380,7 +378,7 @@ msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
 "to the preferred location (%s) but encountered an error: %s"
 msgstr ""
-"Tìm thấy tệp tin lịch sử cũ của nano (%s) cái mà tôi đã thử di chuyển đến\n"
+"Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà tôi đã thử di chuyển đến\n"
 "vị trí ưu tiên (%s) nhưng lại gặp một lỗi: %s"
 
 #: src/files.c:3016
@@ -390,7 +388,7 @@ msgid ""
 "to the preferred location (%s)\n"
 "(see the nano FAQ about this change)"
 msgstr ""
-"Tìm thấy tệp tin lịch sử cũ của nano (%s) cái mà Tôi đã di chuyển\n"
+"Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà Tôi đã di chuyển\n"
 "tới vị trí ưu tiên (%s)\n"
 "(xem FAQ của nano để có thông tin về thay đổi này)"
 
@@ -497,7 +495,7 @@ msgstr "Đi xuống một màn hình"
 
 #: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Cắt dòng hiện tại và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Cắt dòng hiện tại và ghi nó vào bộ đệm cắt"
 
 #: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
@@ -529,7 +527,7 @@ msgstr "Lặp lại tìm kiếm cuối"
 
 #: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Sao chép dòng hiện tại và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Sao chép dòng hiện tại và ghi nó vào bộ đệm cắt"
 
 #: src/global.c:545
 msgid "Indent the current line"
@@ -658,7 +656,7 @@ msgstr "Ngưng trình soạn thảo (nếu tính năng ngưng đã được bậ
 
 #: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Bật/tắt khả năng phân biệt chữ HOA/thường của việc tìm"
+msgstr "Bật/tắt phân biệt chữ HOA/thường khi tìm kiếm"
 
 #: src/global.c:604
 msgid "Reverse the direction of the search"
@@ -745,9 +743,8 @@ msgid "Go to next linter msg"
 msgstr "Đến lời nhắn lint kế"
 
 #: src/global.c:642
-#, fuzzy
 msgid "Invoke formatter, if available"
-msgstr "Gọi trình lint, nếu có thể"
+msgstr "Gọi trình định dạng, nếu có thể"
 
 #. TRANSLATORS: Try to keep the following strings at most 10 characters.
 #: src/global.c:662
@@ -780,12 +777,11 @@ msgstr "Chính tả"
 
 #: src/global.c:738
 msgid "To Linter"
-msgstr "Linter"
+msgstr "Lint"
 
 #: src/global.c:740
-#, fuzzy
 msgid "Formatter"
-msgstr "Định dạng DOS"
+msgstr "Bộ định dạng"
 
 #: src/global.c:745
 msgid "Case Sens"
@@ -913,11 +909,11 @@ msgstr "Enter"
 
 #: src/global.c:876
 msgid "Delete"
-msgstr "Xoá"
+msgstr "Xóa"
 
 #: src/global.c:878
 msgid "Backspace"
-msgstr "Xoá lùi"
+msgstr "Xóa lùi"
 
 #: src/global.c:888
 msgid "CutTillEnd"
@@ -1164,17 +1160,17 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Văn bản của Trợ giúp cho Ghi nhớ tập tin\n"
+"Văn bản của Trợ giúp cho việc lưu tập tin\n"
 "\n"
-" Hãy gõ tên bạn muốn ghi nhớ cho tập tin hiện tại và gõ Enter để hoàn thành "
-"ghi nhá»›.\n"
+" Hãy gõ tên bạn muốn lưu cho tập tin hiện tại và gõ Enter để hoàn thành "
+"lÆ°u.\n"
 "\n"
 " Nếu đã lựa chọn một đoạn văn bản nào đó (bằng dấu hiệu), thì chương trình "
-"sẽ nhắc ghi nhớ đoạn văn bản đã lựa chọn đó vào một tập tin riêng rẽ.  Để "
-"giảm khả năng ghi một phần đè lên cả tập tin hiện tại, thì tên tập tin hiện "
-"tại không phải là mặc định trong chế độ này.\n"
+"sẽ nhắc lưu đoạn văn bản đã lựa chọn đó vào một tập tin riêng rẽ.  Để giảm "
+"khả năng ghi một phần đè lên cả tập tin hiện tại, thì tên tập tin hiện tại "
+"không phải là mặc định trong chế độ này.\n"
 "\n"
-" Có thể dùng các phím chức năng sau trong chế độ Ghi nhớ Tập tin:\n"
+" Có thể dùng các phím chức năng sau trong chế độ lưu Tập tin:\n"
 "\n"
 
 #: src/help.c:258
@@ -1387,7 +1383,7 @@ msgstr ""
 
 #: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Kích thước cửa sổ quá nhỏ cho nano...\n"
+msgstr "Kích thước cửa sổ quá nhỏ cho nano…\n"
 
 #: src/nano.c:836
 #, c-format
@@ -1395,7 +1391,7 @@ msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Cách dùng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]...\n"
+"Cách dùng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]…\n"
 "\n"
 
 #: src/nano.c:839
@@ -1436,7 +1432,7 @@ msgstr "--backupdir=<thư_mục>"
 
 #: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Thư mục để ghi nhớ tập tin lưu trữ duy nhất"
+msgstr "Thư mục để lưu tập tin lưu trữ duy nhất"
 
 #: src/nano.c:855
 msgid "Use bold instead of reverse video text"
@@ -1616,7 +1612,7 @@ msgstr "Dùng chương trình kiểm tra chính tả khác"
 
 #: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Tự động ghi nhớ khi thoát, đừng hỏi lại"
+msgstr "Tự động lưu khi thoát, đừng hỏi lại"
 
 #: src/nano.c:947
 msgid "View mode (read-only)"
@@ -1632,7 +1628,7 @@ msgstr "Đừng hiển thị hai dòng trợ giúp"
 
 #: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Bật dùng sự Tạm hoãn"
+msgstr "Bật tạm ngưng"
 
 #: src/nano.c:954
 msgid "Enable soft line wrapping"
@@ -1640,15 +1636,15 @@ msgstr "Bật ngắt dòng mềm"
 
 #: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano phiên bản %s (biên dịch %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, phiên bản %s\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Địa chỉ thư: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1657,68 +1653,68 @@ msgstr ""
 "\n"
 " Tùy chọn biên dịch:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Rất tiếc, hỗ trợ cho chức năng này đã bị tắt"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr "Không có tên tập tin"
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Ghi lại bộ đệm đã được sửa đổi (TRẢ LỜI “K” SẼ BỎ MỌI THAY ĐỔI) (C/K) ? "
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Tiếc là không thể mở lại đầu vào tiêu chuẩn từ bàn phím\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Đang đọc từ đầu vào tiêu chuẩn, bấm ^C để hủy bỏ\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Dùng “fg” để quay lại nano.\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "được bật"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Lệnh không rõ"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON bị lờ đi."
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF bị lờ đi."
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tab “%s” không hợp lệ"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Yêu cầu một kích thước tô đầy “%s” không hợp lệ"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr "Gõ “%s -h” để biết danh sách các tùy chọn sẵn có.\n"
@@ -1760,8 +1756,8 @@ msgstr "Lỗi trong %s trên dòng %lu: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "Đối số “%s” chưa được \" kết thúc"
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Biểu thức chính quy phải bắt đầu và kết thúc bởi một ký tự \""
 
@@ -1784,7 +1780,7 @@ msgstr "Cú pháp “default” không chấp nhận phần mở rộng"
 
 #: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Thiếu tên khoá"
+msgstr "Thiếu tên khóa"
 
 #: src/rcfile.c:442 src/rcfile.c:453
 msgid "Key name is too short"
@@ -1814,22 +1810,22 @@ msgstr "Không thể ánh xạ tên “%s” đến một hàm"
 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:524
+#: src/rcfile.c:528
 #, 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:539
+#: src/rcfile.c:543
 #, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tiếc là không cho phép dùng tổ hợp phím “%s”"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, c-format
 msgid "Error expanding %s: %s"
 msgstr "Gặp lỗi khi khải triển %s: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1852,67 +1848,65 @@ msgstr ""
 " * bright\tsáng\n"
 "cho màu của văn bản."
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Không thêm được một chỉ thị màu mà không có dòng cú pháp"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Thiếu các chuỗi biểu thức chính quy"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "“start=” (bắt đầu) thì yêu cầu một phần “end=” (kết thúc) tương ứng"
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "Màu nền “%s” không thể là màu sáng (khó đọc)"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Không thêm được một biểu thức chính quy kiểu phần đầu mà không có câu lệnh "
 "cú pháp"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 "Không thêm được một biểu thức chính quy kiểu chuỗi mà không có câu lệnh cú "
 "pháp"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "Thiếu tên chuỗi kỳ diệu"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 msgid "Cannot add a linter without a syntax command"
 msgstr "Không thêm được một linter đầu mà không có câu lệnh cú pháp"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 msgid "Missing linter command"
 msgstr "Thiếu lệnh linter"
 
-#: src/rcfile.c:1006
-#, fuzzy
+#: src/rcfile.c:1010
 msgid "Cannot add formatter without a syntax command"
-msgstr "Không thêm được một linter đầu mà không có câu lệnh cú pháp"
+msgstr "Không thêm được một bộ định dạng mà không có câu lệnh cú pháp"
 
-#: src/rcfile.c:1011
-#, fuzzy
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
-msgstr "Thiếu lệnh linter"
+msgstr "Thiếu lệnh trình định dạng"
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Lỗi nghiêm trọng: chưa ánh xạ phím với chức năng “%s”. Thoát ra.\n"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
@@ -1920,62 +1914,62 @@ msgstr ""
 "Nếu cần, hãy sử dụng trình soạn thảo nano với tùy chọn “-I” để điều chỉnh "
 "cài đặt nanorc của bạn.\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "Không thể tìm thấy cú pháp “%s” để khai triển"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Lệnh “%s” không được phép trong tập tin đã bao gồm"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Cú pháp “%s” không có câu lệnh màu"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Không hiểu câu lệnh “%s”"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 msgid "Missing option"
 msgstr "Thiếu tùy chọn"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tùy chọn “%s” cần một tham số"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Tùy chọn không phải là một chuỗi đa byte hợp lệ"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Yêu cầu các ký tự không phải khoảng trắng"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "Không thể bỏ đặt tùy chọn “%s”"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, c-format
 msgid "Unknown option \"%s\""
 msgstr "Không hiểu tùy chọn “%s”"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Tôi không thể tìm thấy thư mục cá nhân của mình!"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1990,57 +1984,57 @@ msgid "\"%.*s%s\" not found"
 msgstr "Không tìm thấy “%.*s%s”"
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [Phân biệt HOA/thường]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [BTCQ]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [Ngược lại]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (thay thế) trong lựa chọn"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (thay thế)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Thay thế minh dụ này?"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Thay thế bằng"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Đã thay thế %lu lần"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Nhập số thứ tự dòng, cột"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Không phải ngoặc đơn"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
@@ -2056,10 +2050,10 @@ msgstr "Hủy dấu văn bản"
 msgid "Nothing in undo buffer!"
 msgstr "Không có gì trong vùng đệm hủy bước!"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
-msgstr "Lỗi nội bộ: không thể khớp dòng %ld. Hãy lưu công việc của bạn lại."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Lỗi nội bộ: không thể khớp dòng %d. Hãy lưu công việc của bạn lại."
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
@@ -2067,7 +2061,7 @@ msgstr "thêm văn bản"
 
 #: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "xoá văn bản"
+msgstr "xóa văn bản"
 
 #: src/text.c:491 src/text.c:641
 msgid "line join"
@@ -2111,22 +2105,17 @@ msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 "Lỗi nội bộ: không thể cài đặt redo (hoàn lại). Hãy lưu công việc của bạn lại."
 
-#: src/text.c:590
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "Lỗi nội bộ: không thể khớp dòng %d. Hãy lưu công việc của bạn lại."
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "Không thể tạo đường ống"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
@@ -2150,9 +2139,9 @@ msgstr "Sửa chuỗi thay thế"
 
 #: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ..."
+msgstr "Đang tạo danh sách từ sai chính tả, xin hãy chờ…"
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Không lấy được kích thước của bộ đệm đường ống"
 
@@ -2168,89 +2157,88 @@ msgstr "Gặp lỗi khi gọi “sort -f”"
 msgid "Error invoking \"uniq\""
 msgstr "Gặp lỗi khi gọi “uniq”"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Lỗi gọi “%s”"
 
-#: src/text.c:2889
+#: src/text.c:2885
 msgid "Invoking spell checker, please wait"
 msgstr "Gọi trình kiểm tra chính tả, vui lòng chờ"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Kiểm tra chính tả không thành công: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 msgid "No linter defined for this type of file!"
 msgstr "Không có lint cho kiểu này của tập tin!"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr "Ghi lại bộ đệm đã sửa trước khi lint?"
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr "Đang gọi bộ lint, vui lòng chờ"
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr "Nhận được 0 dòng có thể phân tích từ lệnh: %s"
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 "Lời nhắn này là dành cho tập tin %s chưa được mở, mở nó trong bộ đệm mới?"
 
-#: src/text.c:3209
+#: src/text.c:3205
 msgid "At last message"
 msgstr "Tại thông báo cuối"
 
-#: src/text.c:3214
+#: src/text.c:3210
 msgid "At first message"
 msgstr "Tại thông báo đầu"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
-msgstr ""
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Lỗi: chưa định nghĩa bộ định dạng"
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
-msgstr ""
+msgstr "Đã xong"
 
-#: src/text.c:3285
-#, fuzzy
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
-msgstr "Đang gọi bộ lint, vui lòng chờ"
+msgstr "Đang gọi bộ định dạng, vui lòng chờ"
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
-msgstr ""
+msgstr "Hoàn tất định dạng"
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Trong lựa chọn:  "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "Dữ liệu nhập nguyên bản"
 
@@ -2274,7 +2262,7 @@ msgstr "Trình bày"
 
 #: src/winio.c:2157
 msgid "DIR:"
-msgstr "TH.MỤC:"
+msgstr "TMỤC:"
 
 #: src/winio.c:2164
 msgid "File:"
@@ -2315,7 +2303,7 @@ msgstr "Tổ chức Phần mềm Tự do (FSF)"
 
 #: src/winio.c:3512
 msgid "the many translators and the TP"
-msgstr ""
+msgstr "nhiều người dịch thuật và TP"
 
 #: src/winio.c:3513
 msgid "For ncurses:"
@@ -2323,12 +2311,15 @@ msgstr "Dành cho ncurses:"
 
 #: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "và những người khác mà chúng tôi quên..."
+msgstr "và những người khác mà chúng tôi quên…"
 
 #: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Lỗi nội bộ: không thể khớp dòng %ld. Hãy lưu công việc của bạn lại."
+
 #~ msgid "line wrap"
 #~ msgstr "ngắt dòng"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fa59c7f6c926e61f5e25bf9ae139afa40590fc7a..5853c7ca9080a8b469fcd658f451517f60d9ab0b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2011-03-08 03:15+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -24,8 +24,8 @@ msgid "Go To Directory"
 msgstr "跳至目录"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -37,7 +37,7 @@ msgstr "在限制模式中无法跳至%s 外部"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读取%s 出错：%s"
@@ -59,20 +59,20 @@ msgid "(parent dir)"
 msgstr "(父目录)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "搜索"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已从头搜索"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "这是惟一出现之处"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "没有当前搜索模式"
 
@@ -203,12 +203,12 @@ msgstr "新文件"
 msgid "\"%s\" not found"
 msgstr "找不到\"%s\""
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
@@ -268,8 +268,8 @@ msgstr "太多备份文件？"
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
@@ -1625,16 +1625,16 @@ msgid "Enable soft line wrapping"
 msgstr "启用软换行"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本%s (编译于%s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 电子邮件: nano@nano-editor.org\t\t网页: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1643,67 +1643,67 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "对不起，此功能的支持以禁用"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "储存更动过的缓冲区吗(回答 \"No\" 会撤销修改)？"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对不起，无法从键盘设备重新打开标准输入\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "正在从标准输入读入，可用 ^C 中断\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到SIGHUP 或SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用\"fg\" 返回nano\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "已启用"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "已禁用"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "未知命令"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略XON，嗯嗯。"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略XOFF，嗯嗯。"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的制表符宽度%s 无效"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填满行数\"%s\" 无效"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1745,8 +1745,8 @@ msgstr "在%s(第%lu 行)中发生错误："
 msgid "Argument '%s' has an unterminated \""
 msgstr "参数%s 有未封闭的 \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示式字符串必须以 \" 字符开始及结束"
 
@@ -1800,22 +1800,22 @@ msgstr "无法映射名字\"%s\" 到一个函数"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射名字\"%s\" 到一个菜单"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "对不起，键\"%s\" 属非法绑定"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "读取%s 出错：%s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1830,126 +1830,126 @@ msgstr ""
 "\"black\"(黑)，选择性的前置字 \"bright\"(明亮) \n"
 "可用于前景色。"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "无法直接增加颜色而没有语法行"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正则表示式字符串"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求对应的\"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色%s 不可为明亮"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "无法直接增加头部正则表达式而没有语法行"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "无法在没有语法命令的情况下添加魔字符串"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "缺少魔字符串名称"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "无法直接增加头部正则表达式而没有语法行"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "无法直接增加颜色而没有语法行"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "严重错误; 没有键映射到函数 \"%s\""
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "正在退出。如果您想调整您的nanorc 设置，请使用nano 的-I 选项。\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "无法映射名字\"%s\" 到一个菜单"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令\"%s\" 被禁止在包含文件中使用"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法\"%s\" 没有color 命令"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别\"%s\" 命令"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "缺少颜色名称"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需要参数"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "选项并非正确的多字节字符串"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需要非空格字符"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需要两个单行字符"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "无法解除旗标 %s 设定"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "未知旗标 %s"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目录！哇！"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1964,57 +1964,57 @@ msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [区分大小写]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [正则表示式]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [向后搜索]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在标记中(替换)"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (替换)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "替换这个？"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "替换我"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已替换%lu 处"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "输入列号，行号"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "无效的列号或行号"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "并非一个括号"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "无对应括号"
 
@@ -2030,9 +2030,9 @@ msgstr "标记解除"
 msgid "Nothing in undo buffer!"
 msgstr "没有可撤销的操作！"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "内部错误：无法匹配行 %d。请保存您的工作"
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2085,22 +2085,17 @@ msgstr "没有可重做的操作！"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "内部错误：无法配置取消剪切。请保存您的工作"
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "内部错误：无法匹配行 %d。请保存您的工作"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已重做操作(%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "无法建立管线功能"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "执行功能无效"
 
@@ -2126,7 +2121,7 @@ msgstr "编辑替代文字"
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请稍待..."
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "无法得知管线缓冲区大小"
 
@@ -2142,91 +2137,91 @@ msgstr "运行 \"sort -f\" 错误"
 msgid "Error invoking \"uniq\""
 msgstr "运行 \"uniq\" 错误"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼写检查结束"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "运行 \"%s\" 错误"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "尝试运行拼写检查"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "不要将换行加到文件末端"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "显示此信息"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "显示此信息"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "于选择部份："
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "原形输入"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b6ba40387652175d87c062137488c813e9692f71..bc5f34c1c308ce8c9753b097d8b7a339e32a6987 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 11:56-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2013-06-24 23:29+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -23,8 +23,8 @@ msgid "Go To Directory"
 msgstr "跳至目錄"
 
 #: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
-#: src/nano.c:1160 src/search.c:213 src/search.c:303 src/search.c:964
-#: src/search.c:1040 src/text.c:2953 src/text.c:3168
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -36,7 +36,7 @@ msgstr "在限制模式中無法至 %s 外部"
 #: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
 #: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
 #: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
-#: src/rcfile.c:586 src/rcfile.c:1422
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
@@ -58,20 +58,20 @@ msgid "(parent dir)"
 msgstr "(上層目錄)"
 
 #. TRANSLATORS: This is the main search prompt.
-#: src/browser.c:759 src/search.c:182
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "搜尋"
 
-#: src/browser.c:812 src/search.c:384
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已從頭搜尋"
 
-#: src/browser.c:885 src/browser.c:912 src/search.c:503 src/search.c:506
-#: src/search.c:563 src/search.c:566
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "這是惟一出現之處"
 
-#: src/browser.c:915 src/search.c:572
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "沒有符合目前搜尋形式者"
 
@@ -202,12 +202,12 @@ msgstr "新檔案"
 msgid "\"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:961 src/rcfile.c:579 src/rcfile.c:1372 src/rcfile.c:1413
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:962 src/rcfile.c:580 src/rcfile.c:1373 src/rcfile.c:1414
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個裝置檔案"
@@ -267,8 +267,8 @@ msgstr "太多備份檔案？"
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:1993 src/text.c:2871 src/text.c:2883 src/text.c:3265
-#: src/text.c:3274
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
@@ -1627,16 +1627,16 @@ msgid "Enable soft line wrapping"
 msgstr "開啟長列換列"
 
 #: src/nano.c:963
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
 
-#: src/nano.c:967
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 電子郵件: nano@nano-editor.org\t\t網頁: http://www.nano-editor.org/"
 
-#: src/nano.c:968
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1645,67 +1645,67 @@ msgstr ""
 "\n"
 " 編譯選項:"
 
-#: src/nano.c:1097
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "抱歉，已經關閉此功能的支援"
 
-#: src/nano.c:1126
+#: src/nano.c:1125
 msgid "No file name"
 msgstr ""
 
-#: src/nano.c:1137
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "儲存更動過的緩衝區嗎 (回答 \"No\" 會撤銷修改)？"
 
-#: src/nano.c:1190
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "無法重新開啟來自鍵盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1215
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "讀取自標準輸入，^C 以放棄\n"
 
-#: src/nano.c:1281
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1303
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "利用 \"fg\" 來回到 nano。\n"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "é–‹å•Ÿ"
 
-#: src/nano.c:1483
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:1637 src/winio.c:1283
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "不明的命令"
 
-#: src/nano.c:1749
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略 XON，嗯嗯。"
 
-#: src/nano.c:1754
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略 XOFF，嗯嗯。"
 
-#: src/nano.c:2312 src/rcfile.c:1321
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所要求的跳格寬度 \"%s\" 無效"
 
-#: src/nano.c:2376 src/rcfile.c:1246
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所要求的填滿行數 \"%s\" 無效"
 
-#: src/nano.c:2417
+#: src/nano.c:2415
 #, c-format
 msgid "Type '%s -h' for a list of available options.\n"
 msgstr ""
@@ -1747,8 +1747,8 @@ msgstr "在 %s (位於第 %lu 列) 中發生錯誤: "
 msgid "Argument '%s' has an unterminated \""
 msgstr "引數 '%s' 有未封閉的 \""
 
-#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:726 src/rcfile.c:787
-#: src/rcfile.c:876 src/rcfile.c:928
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表示式字串必須以 \" 字元開始及結束"
 
@@ -1802,22 +1802,22 @@ msgstr "無法映射名稱「%s」到某一功能"
 msgid "Cannot map name \"%s\" to a menu"
 msgstr "無法映射名稱「%s」到某一選單"
 
-#: src/rcfile.c:524
+#: src/rcfile.c:528
 #, c-format
 msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:539
+#: src/rcfile.c:543
 #, fuzzy, c-format
 msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "抱歉，按鍵字串「%s」是不合法的繫結"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
 #, fuzzy, c-format
 msgid "Error expanding %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
 
-#: src/rcfile.c:668
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1832,126 +1832,126 @@ msgstr ""
 "\"black\"(黑)，加上選擇性的前置字 \"bright\"(明亮) \n"
 "可用於前景色。"
 
-#: src/rcfile.c:690
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "無法增加顏色命令而沒有語法命令"
 
-#: src/rcfile.c:695
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:705 src/rcfile.c:866
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正規表示式字串"
 
-#: src/rcfile.c:781
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" 要求對應的 \"end=\""
 
-#: src/rcfile.c:833
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr "背景色 \"%s\" 不可為明亮"
 
-#: src/rcfile.c:861
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "無法增加標頭正規表示式而沒有語法命令"
 
-#: src/rcfile.c:917
+#: src/rcfile.c:921
 msgid "Cannot add a magic string regex without a syntax command"
 msgstr "無法增加魔法正規表示式而沒有語法命令"
 
-#: src/rcfile.c:922
+#: src/rcfile.c:926
 msgid "Missing magic string name"
 msgstr "缺少魔法字串名稱"
 
-#: src/rcfile.c:981
+#: src/rcfile.c:985
 #, fuzzy
 msgid "Cannot add a linter without a syntax command"
 msgstr "無法增加標頭正規表示式而沒有語法命令"
 
-#: src/rcfile.c:986
+#: src/rcfile.c:990
 #, fuzzy
 msgid "Missing linter command"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:1006
+#: src/rcfile.c:1010
 #, fuzzy
 msgid "Cannot add formatter without a syntax command"
 msgstr "無法增加顏色命令而沒有語法命令"
 
-#: src/rcfile.c:1011
+#: src/rcfile.c:1015
 msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:1041
+#: src/rcfile.c:1045
 #, fuzzy, c-format
 msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "嚴重錯誤：沒有按鍵映射至功能「%s」"
 
-#: src/rcfile.c:1043
+#: src/rcfile.c:1047
 #, fuzzy, c-format
 msgid ""
 "If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "離開中。 如果需要調整您的 nanorc 設定值，請使用 nano 與 -I 選項\n"
 
-#: src/rcfile.c:1104
+#: src/rcfile.c:1108
 #, fuzzy, c-format
 msgid "Could not find syntax \"%s\" to extend"
 msgstr "無法映射名稱「%s」到某一選單"
 
-#: src/rcfile.c:1120 src/rcfile.c:1129 src/rcfile.c:1139
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令「%s」在包含的檔案中不允許"
 
-#: src/rcfile.c:1145 src/rcfile.c:1346
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "語法「%s」沒有任何顏色命令"
 
-#: src/rcfile.c:1167
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "無法辨識 \"%s\" 命令"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1186
 #, fuzzy
 msgid "Missing option"
 msgstr "缺少顏色名稱"
 
-#: src/rcfile.c:1204
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "選項 \"%s\" 要求引數"
 
-#: src/rcfile.c:1222
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "選項並非正確的多位元字串"
 
-#: src/rcfile.c:1259 src/rcfile.c:1287 src/rcfile.c:1296
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需要非空格字元"
 
-#: src/rcfile.c:1269
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需要兩個單行字元"
 
-#: src/rcfile.c:1335
+#: src/rcfile.c:1339
 #, fuzzy, c-format
 msgid "Cannot unset option \"%s\""
 msgstr "無法解除旗標 \"%s\" 設定"
 
-#: src/rcfile.c:1341
+#: src/rcfile.c:1345
 #, fuzzy, c-format
 msgid "Unknown option \"%s\""
 msgstr "旗標 \"%s\" 無法辨識"
 
-#: src/rcfile.c:1400
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找不到我的家目錄！哇！"
 
-#: src/rcfile.c:1438
+#: src/rcfile.c:1442
 #, c-format
 msgid ""
 "\n"
@@ -1966,57 +1966,57 @@ msgid "\"%.*s%s\" not found"
 msgstr "找不到 \"%.*s%s\""
 
 #. TRANSLATORS: The next three strings are modifiers of the search prompt.
-#: src/search.c:185
+#: src/search.c:184
 msgid " [Case Sensitive]"
 msgstr " [符合大小寫]"
 
-#: src/search.c:189
+#: src/search.c:188
 msgid " [Regexp]"
 msgstr " [正規表示式]"
 
-#: src/search.c:193
+#: src/search.c:192
 msgid " [Backwards]"
 msgstr " [向後搜尋]"
 
 #. TRANSLATORS: The next two strings are modifiers of the search prompt.
-#: src/search.c:198
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在標記中(置換)"
 
-#: src/search.c:200
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (置換)"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:774
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "置換這個？"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:951
+#: src/search.c:945
 msgid "Replace with"
 msgstr "以此置換"
 
-#: src/search.c:993
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已置換 %lu 處"
 
 #. TRANSLATORS: This is a prompt.
-#: src/search.c:1034
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "輸入列號，行號"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "無效的列號或行號"
 
-#: src/search.c:1215
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "並非一個括號"
 
-#: src/search.c:1282
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "無對應括號"
 
@@ -2032,9 +2032,9 @@ msgstr "標記解除"
 msgid "Nothing in undo buffer!"
 msgstr "復原緩衝區中沒有任何東西！"
 
-#: src/text.c:445
+#: src/text.c:445 src/text.c:590
 #, fuzzy, c-format
-msgid "Internal error: can't match line %ld.  Please save your work."
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "內部錯誤：無法匹配第 %d 列。 請儲存您的工作"
 
 #: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
@@ -2087,22 +2087,17 @@ msgstr "沒有任何東西可重做！"
 msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "內部錯誤：無法設定取消剪下。 請儲存您的工作。"
 
-#: src/text.c:590
-#, fuzzy, c-format
-msgid "Internal error: can't match line %d.  Please save your work."
-msgstr "內部錯誤：無法匹配第 %d 列。 請儲存您的工作"
-
 #: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已重做動作 (%s)"
 
-#: src/text.c:785 src/text.c:2490 src/text.c:2967
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 msgid "Could not create pipe"
 msgstr "無法建立管線功能"
 
-#: src/text.c:811 src/text.c:2578 src/text.c:2730 src/text.c:3018
-#: src/text.c:3316
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "執行功能無效"
 
@@ -2128,7 +2123,7 @@ msgstr "編輯替代文字"
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立錯字列表，請稍待…"
 
-#: src/text.c:2584 src/text.c:3026
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩衝區大小"
 
@@ -2144,91 +2139,91 @@ msgstr "呼叫 \"sort -f\" 錯誤"
 msgid "Error invoking \"uniq\""
 msgstr "呼叫 \"uniq\" 錯誤"
 
-#: src/text.c:2698 src/text.c:2911
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼字檢查結束"
 
-#: src/text.c:2757 src/text.c:3345
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "呼叫 \"%s\" 錯誤"
 
-#: src/text.c:2889
+#: src/text.c:2885
 #, fuzzy
 msgid "Invoking spell checker, please wait"
 msgstr "嘗試呼叫拼字檢查"
 
-#: src/text.c:2906
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼字檢查失敗: %s"
 
-#: src/text.c:2908
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/text.c:2941
+#: src/text.c:2937
 #, fuzzy
 msgid "No linter defined for this type of file!"
 msgstr "不要將換列加到檔案末端"
 
-#: src/text.c:2951
+#: src/text.c:2947
 msgid "Save modified buffer before linting?"
 msgstr ""
 
-#: src/text.c:2973
+#: src/text.c:2969
 msgid "Invoking linter, please wait"
 msgstr ""
 
-#: src/text.c:3129
+#: src/text.c:3125
 #, c-format
 msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3163
+#: src/text.c:3159
 #, c-format
 msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
 
-#: src/text.c:3209
+#: src/text.c:3205
 #, fuzzy
 msgid "At last message"
 msgstr "顯示此訊息"
 
-#: src/text.c:3214
+#: src/text.c:3210
 #, fuzzy
 msgid "At first message"
 msgstr "顯示此訊息"
 
-#: src/text.c:3255
-msgid "Error: no linter defined"
+#: src/text.c:3250
+msgid "Error: no formatter defined"
 msgstr ""
 
-#: src/text.c:3280
+#: src/text.c:3275
 msgid "Finished"
 msgstr ""
 
-#: src/text.c:3285
+#: src/text.c:3280
 msgid "Invoking formatter, please wait"
 msgstr ""
 
-#: src/text.c:3367
+#: src/text.c:3360
 msgid "Finished formatting"
 msgstr ""
 
-#: src/text.c:3445
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 
-#: src/text.c:3446
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "於選擇部分: "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/text.c:3460
+#: src/text.c:3453
 msgid "Verbatim Input"
 msgstr "原形輸入"