nano

nano with my custom patches
git clone git://bsandro.tech/nano
Log | Files | Refs | README | LICENSE
commit 566635ec16f2f3be2e9ce788fb239f9765cc8dae
parent 95a9de0d3fcac8012c71a20b1f5247f6b875104b
Author: Chris Allegretta <chrisa@asty.org>
Date:   Sat, 30 Aug 2008 21:40:33 +0000

GNU nano 2.1.5 release



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4319 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:

MChangeLog | 1+


MNEWS | 11+++++++++++


Mpo/bg.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/ca.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/cs.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/da.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/de.po | 306++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/es.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/eu.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/fi.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/fr.po | 284++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/ga.po | 329+++++++++++++++++++++++++++++++++++++++++--------------------------------------


Mpo/gl.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/hu.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/id.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/it.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/ms.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/nano.pot | 253++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mpo/nb.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/nl.po | 309+++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/nn.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/pl.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/pt_BR.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/ro.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/ru.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/rw.po | 258++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/sr.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/sv.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/tr.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/uk.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/vi.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


Mpo/zh_CN.po | 269++++++++++++++++++++++++++++++++++++++++---------------------------------------


Mpo/zh_TW.po | 256++++++++++++++++++++++++++++++++++++++++----------------------------------------


33 files changed, 4094 insertions(+), 4070 deletions(-)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,4 @@
+GNU nano 2.1.5 - 2008.08.30
 2008-08-29 Chris Allegretta <chrisa@asty.org>
 	* configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support
 	  GNU-style word boundaries.  New function fixbounds() to translate from GNU-style to 
diff --git a/NEWS b/NEWS
@@ -1,3 +1,14 @@
+2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
+		contains a better fix for incorrectly reported successful
+		writes on full filesystems, more helpful messages when
+		an internal error occurs in the undo code, and fixes for 
+		various combinations of configure-time options and 
+		compiler flags.  Also included is new support for 
+		changing the rc file name at configure time, and
+		using GNU-style regexes for word-boundaries on systems 
+		which do not support them natively, as well as the ever 
+		popular translation updates.  Rock the tarball.
+
 2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
 		includes fixes for several severe issues with the new
 		undo/redo code.  Also the behavior of writing
diff --git a/po/bg.po b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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,7 +24,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Отиване в директория"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Отменено"
@@ -36,8 +36,8 @@ msgstr "Не може да се излезе от %s в ограничен ре
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
@@ -48,49 +48,49 @@ msgstr "Не може да се премине в горната директо
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(дир)"
 
 # TODO: по-добър превод
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Търсене"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Зачитане на малки/големи]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Рег.израз]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Назад]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Търсене отначало"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Това е единственото съвпадение"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Няма въведен низ за търсене"
 
@@ -108,7 +108,7 @@ msgstr "Няма повече буфери за отваряне на файло
 msgid "Switched to %s"
 msgstr "Превключено на %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Нов буфер"
 
@@ -149,12 +149,12 @@ msgstr "Нов файл"
 msgid "\"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директория"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за устройство"
@@ -207,7 +207,7 @@ msgstr "Твърде много резервни копия?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запис на %s: %s"
@@ -217,62 +217,62 @@ msgstr "Грешка при запис на %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Грешка при записа на временен файл: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Запазен е %lu ред"
 msgstr[1] "Запазени са %lu реда"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS формат]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac формат]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Резервно копие]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Прикрепяне на избрания текст в началото на файл"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Прикрепяне на избрания текст в края на файл"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Запазване на избрания текст във файл"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Име на файла за прикрепяне в началото му"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Име на файла за прикрепяне в края му"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Име на файл за запазване"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Файлът съществува, ПРЕЗАПИСВАНЕ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запазване под РАЗЛИЧНО ИМЕ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(повече)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -422,32 +422,32 @@ msgstr "Вмъкване на файл"
 msgid "Go To Line"
 msgstr "Отив. ред"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Подравняване на текущия абзац"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Отмяна на текущата функция"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Извежда тази помощна информация"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затваряне на текущия файлов буфер/Изход от nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Изход от nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Запазване на текущия файл на диска"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Подравняване на текущия абзац"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Вмъкване на друг файл в текущия"
@@ -708,221 +708,221 @@ msgid "Go to directory"
 msgstr "Отиване в директория"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Затваряне"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Запазване"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Подравн."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Отваряне"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Отрязване"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Изкл.подр."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Поставяне"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Поз.курсор"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Правопис"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Избор на текст"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Отстъп"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Без отстъп"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Следваща дума"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Предишен ред"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Следващ ред"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "End"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Намиране на другата скоба"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Предишен файл"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Следващ файл"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Дословен вход"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "Отр. до края"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Постоянно показване на позицията на курсора"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Използване на още един ред за редактиране"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Плавно превъртане"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Синтактично осветяване"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Автоматичен отстъп"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Отрязване до края"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Автоматично пренасяне"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Запазване на резервни копия"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Много файлови буфери"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Без конвертиране от DOS/Mac формат"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Временно спиране"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -944,7 +944,7 @@ msgstr ""
 "търсене. Ако натиснете „Enter“, без да въвеждате текст, ще се извърши "
 "предишнто търсене.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -958,7 +958,7 @@ msgstr ""
 " Следните клавиши за достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -978,7 +978,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Отиване на ред“:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1000,7 +1000,7 @@ msgstr ""
 "за вмъкване ще се зареди в отделен буфер. Използвайте Meta-< и >, за да "
 "превключвате между буферите.  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1014,7 +1014,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Вмъкване на файл“:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1040,7 +1040,7 @@ msgstr ""
 " Следните клавишни комбинации са налични в режим „Запазване на файл“:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1064,7 +1064,7 @@ msgstr ""
 " Следните клавишни комбинации са налични във файловия браузър:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1088,7 +1088,7 @@ msgstr ""
 "предишното търсене.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1096,7 +1096,7 @@ msgstr ""
 "Следните функционални клавиши са достъпни в режим „Търсене“:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1119,7 +1119,7 @@ msgstr ""
 "браузъра:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 " Може да се използват следните допълнителни функционални клавиши:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 " Може да се използват следните функционални клавиши:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1184,7 +1184,7 @@ msgstr ""
 "редактора, показващ редактирания файл. Лентата за състоянието е третият ред "
 "от долу нагоре и е предназначен за важни съобщения.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1203,7 +1203,7 @@ msgstr ""
 "да бъдат въвеждани с клавишите „Esc“, „Alt“ или „Meta“ в зависимост от "
 "настройките на клавиатурата.   "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1217,7 +1217,7 @@ msgstr ""
 "алтернативните са показани в скоби:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "(вкл/изкл)"
 
@@ -1597,7 +1597,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Низовете за регулярни изрази трябва да започват и завършват със символа \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Неправилен регулярен израз \"%s\": %s"
@@ -1801,9 +1801,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Отстъп вдясно на текущия ред"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1837,7 +1837,7 @@ msgid "text replace"
 msgstr " (за замяна)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1850,7 +1850,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1871,7 +1871,7 @@ msgid "Could not fork"
 msgstr "Неуспех при fork"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1939,7 +1939,7 @@ msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 msgid "In Selection:  "
 msgstr "В избрания текст: "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano е в недостиг на памет!"
 
@@ -1949,56 +1949,56 @@ msgstr "nano е в недостиг на памет!"
 msgid "Unicode Input"
 msgstr "Вход уникод"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Променен"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), стълб %lu/%lu (%d%%), символ %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Текстов редактор nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "версия"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Специални благодарности на:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Фондация „Свободен софтуер“"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "и всички останали, които сме забравили..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Благодарим, че използвате nano!"
 
diff --git a/po/ca.po b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-06-10 01:08+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Cancel·lat"
@@ -33,8 +33,8 @@ msgstr "No es pot anar fora de %s en mode restringit"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "S'ha produït un error en llegir %s: %s"
@@ -45,48 +45,48 @@ msgstr "No es pot ascendir de directori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(directori pare)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Maj/Min]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Cap Enrere]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Recerca recomençada"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Aquesta és la única coincidència"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
@@ -104,7 +104,7 @@ msgstr "No hi ha més búfers de fitxer oberts"
 msgid "Switched to %s"
 msgstr "S'ha canviat a %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nou búfer"
 
@@ -145,12 +145,12 @@ msgstr "Nou fitxer"
 msgid "\"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
@@ -204,7 +204,7 @@ msgstr "Massa fitxers de còpia de seguretat?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
@@ -214,62 +214,62 @@ msgstr "S'ha produït un error en escriure %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "S'ha escrit %lu línia"
 msgstr[1] "S'han escrit %lu línies"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Còpia de seguretat]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Avantposa sel·lecció a un fitxer"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Afegeix la sel·lecció a un fitxer"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Escriu la sel·lecció a un fitxer"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nom del fitxer en el qual avantposar"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nom del fitxer en el qual afegir"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nom del fitxer a escriure"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(més)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -418,32 +418,32 @@ msgstr "Insereix un fitxer"
 msgid "Go To Line"
 msgstr "Vés a línia"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justifica el paràgraf actual"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tanca el búfer de fitxer actual / Surt del nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Surt del nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Escriu el fitxer actual al disc"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justifica el paràgraf actual"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Insereix un altre fitxer dins de l'actual"
@@ -693,221 +693,221 @@ msgid "Go to directory"
 msgstr "Vés al directori"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Tanca"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Desa"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justifica"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Llegeix"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Retalla"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Desjustifica"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Destalla el text"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos Act"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Sagna text"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Desagna text"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Endavant"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Paraula següent"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Ant Línia"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Seg Línia"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Troba la clau corresponent"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Anterior fitxer"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Següent fitxer"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Entrada textual"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desplaçament suau"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Ajustament de línies llargues"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Fitxers de còpia de seguretat"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Múltiples búfers de fitxers"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Sense conversió des del format DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -930,7 +930,7 @@ msgstr ""
 "l'indicatiu de recerca. Prémer Retorn sense introduir cap text durà a terme "
 "l'anterior recerca. "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -944,7 +944,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode Cerca:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -964,7 +964,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode anar a línia:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -986,7 +986,7 @@ msgstr ""
 "F o amb un fitxer nanorc, la inserció d'un fitxer farà que es carregue en un "
 "búfer diferent (feu servir Meta-< i > per a canviar de búfers de fitxer). "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1001,7 +1001,7 @@ msgstr ""
 "fitxer:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode desa el fitxer:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1055,7 +1055,7 @@ msgstr ""
 "fitxers:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1080,7 +1080,7 @@ msgstr ""
 "l'anterior recerca.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 "navegador:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1112,7 +1112,7 @@ msgstr ""
 "«anar a un directori»:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1137,7 +1137,7 @@ msgstr ""
 "d'ortografia:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1157,7 +1157,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles al mode Executa una ordre:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1178,7 +1178,7 @@ msgstr ""
 "inferior i mostra missatges importants. Les últimes dues línies mostren les "
 "dreceres més utilitzades a l'editor."
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1197,7 +1197,7 @@ msgstr ""
 "s'hi pot accedir mitjançant les tecles Esc, Alt o Meta, tot depenent de la "
 "configuració del vostre teclat. "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1211,7 +1211,7 @@ msgstr ""
 "alternatives estan representades entre parèntesi:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "habilita/inhabilita"
 
@@ -1587,7 +1587,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Les cadenes d'expressió regular han de començar i acabar amb un caràcter \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
@@ -1791,9 +1791,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Ajusta el fitxer actual"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1827,7 +1827,7 @@ msgid "text replace"
 msgstr " (a reemplaçar)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1840,7 +1840,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1861,7 +1861,7 @@ msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1929,7 +1929,7 @@ msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano s'ha quedat sense memòria!"
 
@@ -1939,56 +1939,56 @@ msgstr "nano s'ha quedat sense memòria!"
 msgid "Unicode Input"
 msgstr "Entrada d'Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Visualitza"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fitxer:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "línia %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
diff --git a/po/cs.po b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2002-01-30 16:03+0100\n"
 "Last-Translator: Vclav Haisman <V.Haisman@sh.cvut.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Jdi do adrese"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Zrueno"
@@ -31,8 +31,8 @@ msgstr "Nemohu j
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Nemohu zavt %s: %s"
@@ -43,51 +43,51 @@ msgstr "Nemohu se p
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 #, fuzzy
 msgid "Search"
 msgstr "Hledn"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 #, fuzzy
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 #, fuzzy
 msgid " [Backwards]"
 msgstr " [Zpt]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Hledn Zalomeno"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Toto je jedin vskyt"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr "
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nov Buffer"
 
@@ -147,12 +147,12 @@ msgstr "Nov
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "Soubor \"%s\" je adres"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Soubor \"%s\" je soubor zazen"
@@ -209,7 +209,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Nemohu zavt %s: %s"
@@ -219,69 +219,69 @@ msgstr "Nemohu zav
 msgid "Error writing temp file: %s"
 msgstr "Chyba pi mazn doasnho souboru, jejda!"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Zapsno %d dek"
 msgstr[1] "Zapsno %d dek"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:1868
+#: src/files.c:1871
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Zpt]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Pidat vbr do souboru"
 
-#: src/files.c:1877
+#: src/files.c:1880
 #, fuzzy
 msgid "Append Selection to File"
 msgstr "Pidat vbr do souboru"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Zapsat vbr do souboru"
 
-#: src/files.c:1881
+#: src/files.c:1884
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Jmno souboru pro zapsn"
 
-#: src/files.c:1882
+#: src/files.c:1885
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Jmno souboru pro zapsn"
 
-#: src/files.c:1883
+#: src/files.c:1886
 #, fuzzy
 msgid "File Name to Write"
 msgstr "Jmno souboru pro zapsn"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Soubor existuje, PEPSAT ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(vce)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -446,33 +446,33 @@ msgstr "Nov
 msgid "Go To Line"
 msgstr "Jdi na dku"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Zarovnej aktuln odstavec"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Zru aktuln funkci"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zavit aktuln nahran soubor/Ukonit nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Ukonit nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Zapsat aktuln soubor na disk"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Zarovnej aktuln odstavec"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Vlo soubor do aktulnho souboru"
@@ -759,234 +759,234 @@ msgid "Go to directory"
 msgstr "Jdi do adrese"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Zavt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Zapi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Zarovnn"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 #, fuzzy
 msgid "Read File"
 msgstr "st Soubor"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Vyjmi Text"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "OdZarovnej"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Zru vyjmut textu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pozice Kurzoru"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Pravopis"
 
-#: src/global.c:760
+#: src/global.c:758
 #, fuzzy
 msgid "Mark Text"
 msgstr "Ozna Text"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Vyjmi Text"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Vyjmi Text"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Zru vyjmut textu"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Dopedu"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Zpt"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Pedchoz Strana"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Nov Soubor"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Dom"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Najdi zvorku"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr ""
 
-#: src/global.c:839
+#: src/global.c:837
 #, fuzzy
 msgid "Next File"
 msgstr "Nov Soubor"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Npovdn md"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Konstantn pozice kurzoru"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jemn posuv"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatick odsazen"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Vyjmout do konce"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Backspace"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Buffery vce soubor"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Podpora myi"
 
-#: src/global.c:1247
+#: src/global.c:1243
 #, fuzzy
 msgid "No conversion from DOS/Mac format"
 msgstr " -D \t\t--dos\t\t\tZapi soubor v DOS formtu\n"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Zastavit"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1014,7 +1014,7 @@ msgstr ""
 " Nsledujc funkn klvesy jsou pstupn ve Vyhledvacm mdu:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1023,7 +1023,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1043,7 +1043,7 @@ msgstr ""
 " Nsledujc funkn klvesy jsou pstupn v mdu Jdi na Rdku:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1069,7 +1069,7 @@ msgstr ""
 " Nsledujc funkn klvesy jsou pstupn v mdu Vloen souboru:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1078,7 +1078,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1094,7 +1094,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1108,7 +1108,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1137,13 +1137,13 @@ msgstr ""
 " Nsledujc funkn klvesy jsou pstupn ve Vyhledvacm mdu:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 " Nsledujc funkn klvesy jsou pstupn v mdu Jdi na Rdku:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1178,7 +1178,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1190,7 +1190,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1217,7 +1217,7 @@ msgstr ""
 "nastavenou klvesnici. Nsledujc klvesy jsou dostupn v hlavnm okn "
 "editoru. Nhradn klvesy jsou v zvorkch:\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1228,7 +1228,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1237,7 +1237,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 #, fuzzy
 msgid "enable/disable"
 msgstr "%s povol/zaka"
@@ -1638,7 +1638,7 @@ msgstr ""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "regex etzec mus zanat znakem \"\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Nemohu zavt %s: %s"
@@ -1849,9 +1849,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Pesun na konec aktuln dky"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1885,7 +1885,7 @@ msgid "text replace"
 msgstr " (k zmn)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1898,7 +1898,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1921,7 +1921,7 @@ msgid "Could not fork"
 msgstr "Nemou vyvolat program \"ispell\""
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1992,7 +1992,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Pidat vbr do souboru"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "nano: malloc: nedostatek pamti!"
@@ -2003,60 +2003,60 @@ msgstr "nano: malloc: nedostatek pam
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr "Zmnn"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " Adres: ..."
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Soubor: ..."
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "dka %d z %d (%.0f%%), znak %ld z %ld (%.0f%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Nano texotv editor"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "verze "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Pinesen k Vm od:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Speciln dky:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "a komukoliv na koho jsme zapomli..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Dkuji za uvn nano!\n"
diff --git a/po/da.po b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2003-03-08 22:27+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "G til katalog"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Afbrudt"
@@ -32,8 +32,8 @@ msgstr "Kan ikke g
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Drlig anfrselsstreng %s: %s"
@@ -44,48 +44,48 @@ msgstr "Kan ikke g
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Sg"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr "[Versalflsom]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regudtr]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Bagud]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Sgningen genstartet fra begyndelsen"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Dette er det eneste tilflde"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -104,7 +104,7 @@ msgstr "Ikke flere 
 msgid "Switched to %s"
 msgstr "Skiftede til %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -145,12 +145,12 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Filen \"%s\" er en enhedsfil"
@@ -207,7 +207,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Drlig anfrselsstreng %s: %s"
@@ -217,63 +217,63 @@ msgstr "D
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %d linjer"
 msgstr[1] "Skrev %d linje"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Sikkerhedskopi]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Foranstil udvalg til fil"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Tilfj udvalg til fil"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Skriv udvalg til fil"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Filnavn at foranstille p"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Filnavn at tilfje p"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Filnavn at skrive"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Filen eksisterer, OVERSKRIV?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(mere)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -432,33 +432,33 @@ msgstr "N
 msgid "Go To Line"
 msgstr "G til linje"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Ombryd den aktuelle paragraf"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Luk nuvrende indlste fil/afslut nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Afslut nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuelle fil til disk"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Ombryd den aktuelle paragraf"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Indst en anden fil i den nuvrende"
@@ -739,230 +739,230 @@ msgid "Go to directory"
 msgstr "G til katalog"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Luk"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Gem"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Ombryd"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Ls fil"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Klip ud"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Ingen ombrydning"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Ingen udklipning"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Stavekontr."
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Markr tekst"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klip ud"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klip ud"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Ingen udklipning"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Fremad"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Nste ord"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Foregende ord"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Forrige"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Nste fil"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Find anden klamme"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Foregende fil"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Nste fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Fjern"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Slet baglns"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjlpetilstand"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Konstant markrposition"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "jvn rulning"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Farvefremhvelse af syntaks"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Sikkerhedskopir fil"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Flere fil-buffere"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Museunderstttelse"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac-format"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Suspendr"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -988,7 +988,7 @@ msgstr ""
 " De flgende funktionstaster er tilstede i sge-tilstand:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -997,7 +997,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1017,7 +1017,7 @@ msgstr ""
 " De flgende funktionstaster er tilstede i g-til-linje-tilstand:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 " De flgende funktionstaster er tilstede i Indst fil-tilstand:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1057,7 +1057,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1086,7 +1086,7 @@ msgstr ""
 " De flgende funktionstaster er tilstede i Skriv fil-tilstand:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1110,7 +1110,7 @@ msgstr ""
 " De flgende funktionstaster er tilstede i filskimmeren:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1137,13 +1137,13 @@ msgstr ""
 " De flgende funktionstaster er tilstede i sge-tilstand:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 "tilstand:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1191,7 +1191,7 @@ msgstr ""
 " De flgende andre funktioner er tilstede i stavekontrol-tilstand:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 " De flgende taster er tilgngelige i denne tilstand:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1241,7 +1241,7 @@ msgstr ""
 "taster vises inden i parentes:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1252,7 +1252,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1261,7 +1261,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "aktivr/deaktivr"
 
@@ -1664,7 +1664,7 @@ msgstr "argument %s har uafsluttet \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "regex-strenge skal begynde og ende med et \" tegn\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Drligt regulrt udtryk \"%s\": %s"
@@ -1871,9 +1871,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Afbryd den aktuelle funktion"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1907,7 +1907,7 @@ msgid "text replace"
 msgstr " (at erstatte)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1920,7 +1920,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1941,7 +1941,7 @@ msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2010,7 +2010,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Tilfj udvalg til fil"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano har ikke mere hukommelse!"
 
@@ -2020,61 +2020,61 @@ msgstr "nano har ikke mere hukommelse!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " ndret "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " Se "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kol %lu/%lu (%d%%), tegn %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "version "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Prsenteres af:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Srlig tak til:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!\n"
diff --git a/po/de.po b/po/de.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.2\n"
+"Project-Id-Version: nano 2.1.5pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
-"PO-Revision-Date: 2008-06-26 09:25+0200\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
+"PO-Revision-Date: 2008-08-25 10:25+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Abgebrochen"
@@ -34,8 +34,8 @@ msgstr "Kann im eingeschränkten Modus nicht nach außerhalb von %s gehen"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
@@ -46,48 +46,48 @@ msgstr "Konnte nicht ins übergeordnete Verzeichnis wechseln"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(Verz.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Suche"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [GROSS/klein]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [reg. Ausdruck]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Rückwärts]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Suche wieder von vorn"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Das ist das einzige Auftreten"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
@@ -105,7 +105,7 @@ msgstr "Keine weiteren offenen Dateipuffer"
 msgid "Switched to %s"
 msgstr "Umgeschaltet zu %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
@@ -146,12 +146,12 @@ msgstr "Neue Datei"
 msgid "\"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
@@ -196,9 +196,9 @@ msgstr ""
 "nofollow gesetzt ist"
 
 #: src/files.c:1477 src/files.c:1502 src/files.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fehler beim Schreiben der temporären Datei: %s"
+msgstr "Fehler beim Schreiben der Sicherungskopie %s: %s"
 
 #: src/files.c:1478 src/nano.c:675
 msgid "Too many backup files?"
@@ -206,7 +206,7 @@ msgstr "Zu viele Sicherungskopien?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
@@ -216,62 +216,62 @@ msgstr "Fehler beim Schreiben von %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "eine Zeile geschrieben"
 msgstr[1] "%lu Zeilen geschrieben"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-Format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-Format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Sicherungskopie]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Auswahl vorne an Datei anfügen"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Auswahl an Datei anhängen"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Auswahl in Datei schreiben"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Dateiname zum vorn Anfügen"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Dateiname zum Anhängen"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Dateiname zum Speichern"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Datei exisitiert, ÜBERSCHREIBEN? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(mehr)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -420,32 +420,32 @@ msgstr "Datei einfügen"
 msgid "Go To Line"
 msgstr "Zu Zeile"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Absatz ausrichten"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Aktuellen Dateipuffer schließen / nano beenden"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "nano beenden"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Absatz ausrichten"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Datei einfügen"
@@ -508,11 +508,11 @@ msgstr "die aktuelle Zeile ausrücken"
 
 #: src/global.c:527
 msgid "Undo the last operation"
-msgstr ""
+msgstr "letzte Operation rückgängig"
 
 #: src/global.c:528
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "rückgängig gemachte Operation wiederholen"
 
 #: src/global.c:530
 msgid "Go forward one character"
@@ -693,221 +693,221 @@ msgid "Go to directory"
 msgstr "gehe zu Verzeichnis"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Speichern"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Ausrichten"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Datei öffnen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Ausschneiden"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Ausr.rückgängig"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Ausschn. rückgängig"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Cursor"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Rechtschr."
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Einrücken"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Ausrücken"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
-msgstr ""
+msgstr "Rückgängig"
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
-msgstr ""
+msgstr "Wiederholen"
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Nächstes Wort"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Zeile zurück"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Zeile vor"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Andere Klammer finden"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Vorherige Datei"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Nächste Datei"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Direkte Eingabe"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Verwendung einer Zeile mehr zum Editieren"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Sanftes Rollen"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Weißraumanzeige"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Intell. Pos1-Taste"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatischer Einzug"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Lange Zeilen umbrechen"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Sicherungskopien"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Mehrere Dateipuffer"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "in den Hintergrund"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -930,7 +930,7 @@ msgstr ""
 "Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
 "Textes führt die vorhergehende Suche durch.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -944,7 +944,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Suchmodus verfügbar:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -964,7 +964,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Zu-Zeile-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -988,7 +988,7 @@ msgstr ""
 "laden. (Benutzen Sie Meta-< und >, um zwischen den Dateipuffern "
 "umzuschalten.)  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1003,7 +1003,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Einfügen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1031,7 +1031,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Schreiben-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1056,7 +1056,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Dateiwähler verfügbar:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1081,7 +1081,7 @@ msgstr ""
 "Textes führt die vorhergehende Suche durch.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1090,7 +1090,7 @@ msgstr ""
 "verfügbar:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 "Dateiwählers verfügbar:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1138,7 +1138,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind in der Rechtschreibprüfung verfügbar:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1159,7 +1159,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Befehl-Ausführen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1179,7 +1179,7 @@ msgstr ""
 "Hauptfenster enthält die zu bearbeitende Datei.  Die Statuszeile (die dritte "
 "Zeile von unten) zeigt wichtige Meldungen.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1198,7 +1198,7 @@ msgstr ""
 "Symbol (M) angegeben und können je nach Tastatureinstellung mit Esc, Alt "
 "oder Meta eingegeben werden, abhängig von Ihrer Tastatureinstellung.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1212,7 +1212,7 @@ msgstr ""
 "Hauptfenster verfügbar. Alternative Tasten stehen in Klammern:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "aktivieren/deaktivieren"
 
@@ -1589,7 +1589,7 @@ msgstr "Argument „%s“ hat nicht beendetes \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Zeichenketten für reguläre Ausdrücke müssen mit \" anfangen und enden"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
@@ -1790,69 +1790,69 @@ msgstr "Markierung entfernt"
 
 #: src/text.c:377
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nichts im Rückgängig-Puffer!"
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "die aktuelle Zeile einrücken"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
+"Interner Fehler: kann Zeile %d nicht finden. Bitte speichern Sie Ihre Arbeit"
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
-msgstr ""
+msgstr "Text hinzu"
 
 #: src/text.c:409 src/text.c:543
-#, fuzzy
 msgid "text delete"
-msgstr "Nächste Datei"
+msgstr "Text weg"
 
 #: src/text.c:422 src/text.c:552
 msgid "line split"
-msgstr ""
+msgstr "Zeile aufteilen"
 
 #: src/text.c:433 src/text.c:563
 msgid "line join"
-msgstr ""
+msgstr "Zeile verbinden"
 
 #: src/text.c:445
 msgid "text cut"
-msgstr ""
+msgstr "Text ausschneiden"
 
 #: src/text.c:463 src/text.c:624
-#, fuzzy
 msgid "text insert"
-msgstr "Zeile vor"
+msgstr "Text einfügen"
 
 #: src/text.c:481 src/text.c:618
-#, fuzzy
 msgid "text replace"
-msgstr " (zu ersetzen)"
+msgstr "Text ersetzen"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work"
+msgstr "Interner Fehler: unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
 
 #: src/text.c:492
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Operation rückgangig gemacht (%s)"
 
 #: src/text.c:508
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nichts zu wiederholen!"
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
+"Interner Fehler: Vorbereitung für Wiederholen fehlgeschlagen. Bitte "
+"speichern Sie Ihre Arbeit"
 
 #: src/text.c:579
 msgid "line cut"
-msgstr ""
+msgstr "Zeile ausschneiden"
 
 #: src/text.c:638
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Operation wiederholt (%s)"
 
 #: src/text.c:727
 msgid "Could not pipe"
@@ -1863,8 +1863,8 @@ msgid "Could not fork"
 msgstr "Konnte kein Fork durchführen"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
 
 #: src/text.c:1784
 #, c-format
@@ -1931,7 +1931,7 @@ msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano hat keinen Speicher mehr!"
 
@@ -1941,56 +1941,56 @@ msgstr "nano hat keinen Speicher mehr!"
 msgid "Unicode Input"
 msgstr "Unicode-Eingabe"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Verändert"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Ansehen"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Datei:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Zeile %ld/%ld (%d%%), Spalte %lu/%lu (%d%%), Zeichen %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Der nano-Text-Editor"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "und alle Nichtgenannten..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
diff --git a/po/es.po b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2006-08-30 23:38+0100\n"
 "Last-Translator: Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Ir a un Directorio"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Cancelado"
@@ -37,8 +37,8 @@ msgstr "No se puede ir fuera de %s en modo restringido"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Error leyendo '%s': %s"
@@ -50,48 +50,48 @@ msgstr "No se puede ascender de directorio"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(dir padre)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Maysc/Minsc]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Hacia Atrs]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Bsqueda Recomenzada"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "sta es la nica coincidencia"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "No hay patrn de bsqueda"
 
@@ -110,7 +110,7 @@ msgstr "No hay m
 msgid "Switched to %s"
 msgstr "Se ha cambiado a %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nuevo Bfer"
 
@@ -152,12 +152,12 @@ msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
 
 # Aqu pegara poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "El fichero \"%s\" es un directorio"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "El fichero \"%s\" es un dispositivo"
@@ -212,7 +212,7 @@ msgstr "Demasiados ficheros de respaldo?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Error guardando '%s': %s"
@@ -222,67 +222,67 @@ msgstr "Error guardando '%s': %s"
 msgid "Error writing temp file: %s"
 msgstr "Error escribiendo en fichero temporal: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escrita lnea %lu"
 msgstr[1] "%lu lneas escritas"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
 # Como antes, me suena raro que antes de Fichero no haya "un" o "el". sv
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Anteponer seleccin al fichero"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Aadir seleccin al fichero"
 
 # a el -> al. jm
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Escribir seleccin al fichero"
 
 # de -> del. sv
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
 # de -> del. sv
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nombre del fichero al que aadir"
 
 # dem. sv
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "El fichero existe,  SOBREESCRIBIR ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr " Guardar el fichero con un NOMBRE DIFERENTE ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(ms)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -433,32 +433,32 @@ msgstr "Inserte fichero"
 msgid "Go To Line"
 msgstr "Ir a Lnea"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justificar el prrafo actual"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Cancelar la funcin actual"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Cerrar el fichero mostrado / Salir de nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justificar el prrafo actual"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
@@ -721,230 +721,230 @@ msgid "Go to directory"
 msgstr "Ir a un Directorio"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Guardar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justificar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Leer Fich"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "CortarTxt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Desjustificar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "PegarTxt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos actual"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ortografa"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "MarcarTxt"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "CopiarTxt"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "SangrarTxt"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "DesangrarTxt"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Adelante"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Atrs"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Palabra siguiente"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Palabra anterior"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Lnea Ant"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Lnea siguiente"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Buscar la otra llave"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "DesplArriba"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "DesplAbajo"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Fichero anterior"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Fichero siguiente"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
 # Intro (?). sv
 # O introducir, no encuentro el contexto...
 # Ok, es Intro (pero no se usa, parece, reportar el bug) jm
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Suprimir"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Borrar"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "CortarHastaFinal"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Contar Palabras"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo ayuda"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Posicin del cursor constante"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uso de una lnea ms para editar"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Mostrar blancos"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tecla 'smart home'"
 
 # En espaol se dice sangrar. Es un trmino tipogrfico que se usa
 # desde hace mucho, pero que la gente olvida por influencia del ingls. sv
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Auto sangrar"
 
 # de la lnea. sv
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Cortar hasta el final"
 
 # Uf. A ver si alguien encuentra una palabra para decir eso... sv
 # Esto creo que ya lo pregunt en la lista, a parte de en muchos otros
 # sitios y nadie encontr nada convincente. jm
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Ajuste de lneas largas"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversin de las pulsaciones de tabulador a espacios"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Respaldar ficheros"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Mltiples bfers de ficheros"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Soporte para ratn"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "No convertir desde el formato DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Suspensin"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -966,7 +966,7 @@ msgstr ""
 "el indicador. Si pulsa intro sin introducir texto repetir la ltima "
 "bsqueda."
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -980,7 +980,7 @@ msgstr ""
 " Dispone de las siguientes teclas de funcin en modo Bsqueda:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1000,7 +1000,7 @@ msgstr ""
 " Se dispone de las siguientes teclas de funcin en el modo Ir a Lnea:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1022,7 +1022,7 @@ msgstr ""
 "usando un fichero nanorc, el fichero ser insertado en un bfer diferente "
 "(use Meta-< y > para cambiar de bfers de fichero)."
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1036,7 +1036,7 @@ msgstr ""
 " Dispone de las siguientes teclas de funcin en el modo Insertar Fichero:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1064,7 +1064,7 @@ msgstr ""
 " Dispone de las siguientes teclas de funcin en el modo Guardar Fichero:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1090,7 +1090,7 @@ msgstr ""
 "ficheros:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 "bsqueda.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 " Se dispone de las siguientes teclas de funcin en el modo Bsqueda:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1145,7 +1145,7 @@ msgstr ""
 "del Navegador:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1170,7 +1170,7 @@ msgstr ""
 "ortografa:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1190,7 +1190,7 @@ msgstr ""
 "\n"
 " En este modo dispone de las siguientes funciones adicionales:\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "La lnea de estado es la tercera empezando por abajo y muestra mensajes "
 "importantes. "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1231,7 +1231,7 @@ msgstr ""
 "(M-) y se pueden introducir con las teclas Esc, Alt o Meta, dependiendo de "
 "su configuracin de teclado. "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1245,7 +1245,7 @@ msgstr ""
 "Las pulsaciones alternativas se muestran entre parntesis:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "habilitar/deshabilitar"
 
@@ -1624,7 +1624,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr "Las cadenas de regex han de empezar y acabar con un carcter \""
 
 # c-format
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex \"%s\" incorrecta: %s"
@@ -1830,9 +1830,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Sangrar la lnea actual"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1866,7 +1866,7 @@ msgid "text replace"
 msgstr " (a reemplazar)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1879,7 +1879,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1902,7 +1902,7 @@ msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1974,7 +1974,7 @@ msgid "In Selection:  "
 msgstr "En la seleccin:  "
 
 # memoria insuficiente! sv
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano se ha quedado sin memoria!"
 
@@ -1984,56 +1984,56 @@ msgstr "
 msgid "Unicode Input"
 msgstr "Entrada de Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fichero:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lnea %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versin"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Por cortesa de:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera del que nos hayamos olvidado..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Gracias por usar nano!"
 
diff --git a/po/eu.po b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
@@ -34,8 +34,8 @@ msgstr "Ezin da %stik kanpora joan era murriztuan"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
@@ -46,48 +46,48 @@ msgstr "Ezin da direktorioan gora egin"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(aita dir.)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Bilatu"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr "[May/Min]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr "[Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr "[Atzeruntza]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Hau da kointzidentzia bakarra"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
@@ -105,7 +105,7 @@ msgstr "Ez dago irekitako fitxategi buffer gehiagorik"
 msgid "Switched to %s"
 msgstr "%s-ra aldatua"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Bufer berria"
 
@@ -146,12 +146,12 @@ msgstr "Fitxategi berria"
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
@@ -206,7 +206,7 @@ msgstr "Babes-kopia fitxategi gehiegi?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
@@ -216,62 +216,62 @@ msgstr "Errorea %s idazten: %s"
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Lerro %lu idatzia"
 msgstr[1] "%lu lerro idatziak"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr "[DOS formatua]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr "[Mac formatua]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Babeskopia]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Gehitu aukeraketa fitxategiaren hasieran"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Gehitu aukeraketa fitxategian"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun fitxategiaren izena"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Gehituko zaion fitxategiaren izena "
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -421,32 +421,32 @@ msgstr "Txertatu fitxategia"
 msgid "Go To Line"
 msgstr "Joan lerro hontara"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Uneko parrafoa justifikatu"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Uneko parrafoa justifikatu"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
@@ -718,221 +718,221 @@ msgid "Go to directory"
 msgstr "Joan direktorio honetara"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Itxi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Gorde"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justifikatu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Artxiboa irakurri"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Textua moztu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Justifikazioa ezeztatu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Ezmoztu testua"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Koskatu testua"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Aurrean"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Hurrengo hitza"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Aurreko lerroa"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Hurrengo lerroa"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Beste giltz bat bilatu"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Sarrera literala"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Atzera tekla"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Korritze leuna"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Babeskopia fitxategiak"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Fitxategi anitzen buffer-a"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuak"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -953,7 +953,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -967,7 +967,7 @@ msgstr ""
 " Honako funtzio teklak daude Bilaketa moduan:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -986,7 +986,7 @@ msgstr ""
 " Honako funtzio teklak daude joan lerrora moduan:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1009,7 +1009,7 @@ msgstr ""
 "beste buffer batean kargatzen du (erabili Meta-< edo > buffer-ez "
 "aldatzeko).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1023,7 +1023,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi txertaketa moduan:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1049,7 +1049,7 @@ msgstr ""
 "Honako funtzio teklak daude eskuragarri fitxategia idatzi moduan:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1074,7 +1074,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1097,7 +1097,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1105,7 +1105,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri Bilaketa Nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1128,7 +1128,7 @@ msgstr ""
 "moduan:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1152,7 +1152,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri zuzenketa moduan:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1173,7 +1173,7 @@ msgstr ""
 " Honako teklak gaituak daude modu hontan:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1193,7 +1193,7 @@ msgstr ""
 "erakutsiz.  Egoera lerroa da hirugarrena eta informazio garrantzitsuak "
 "ematen ditu  "
 
-#: src/help.c:372
+#: src/help.c:366
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1210,7 +1210,7 @@ msgstr ""
 "agertzen dira, eta Esc, Alt edo Meta-tekla (zure teklatuaren araberakoa) "
 "sakatuz erabili daitezke.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1224,7 +1224,7 @@ msgstr ""
 "parentesi artean erakusten dira:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "gaitu/ezgaitu"
 
@@ -1604,7 +1604,7 @@ msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
@@ -1809,9 +1809,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Koskatu uneko lerroa"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1845,7 +1845,7 @@ msgid "text replace"
 msgstr "(aldatzeko)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1858,7 +1858,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1879,7 +1879,7 @@ msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1947,7 +1947,7 @@ msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano: memoriatik kanpo!"
 
@@ -1957,57 +1957,57 @@ msgstr "nano: memoriatik kanpo!"
 msgid "Unicode Input"
 msgstr "Unicode sarrera"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Aldatua"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Ikusi"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 "%ld/%ld (%d%%) lerroa, %lu/%lu (%d%%) zutabea, %lu/%lu\t (%d%%) karakterea"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Mila esker nano erabiltzeagatik!"
 
diff --git a/po/fi.po b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2003-02-17 22:32+0200\n"
 "Last-Translator: Kalle Olavi Niemitalo <kon@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Peruttu"
@@ -34,8 +34,8 @@ msgstr "Ei voi siirty
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Lainausmerkint %s ei kelpaa: %s"
@@ -46,48 +46,48 @@ msgstr "Ei voi siirty
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Etsi"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Kirj. koko]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Snnke]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Taaksepin]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Etsint jatkuu"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Tm on ainoa esiintym"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr "Ei muita avoimia tiedostoja"
 msgid "Switched to %s"
 msgstr "Vaihdoin tiedostoon %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Uusi teksti"
 
@@ -147,12 +147,12 @@ msgstr "Uusi tiedosto"
 msgid "\"%s\" not found"
 msgstr "Ei lytynyt: \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" on hakemisto"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" on laitetiedosto"
@@ -215,7 +215,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Lainausmerkint %s ei kelpaa: %s"
@@ -225,64 +225,64 @@ msgstr "Lainausmerkint
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%d rivi kirjoitettu"
 msgstr[1] "%d rivi kirjoitettu"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-muoto]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-muoto]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Varmuuskopio]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Lis valinta tiedoston alkuun"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Lis valinta tiedoston loppuun"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Kirjoita valinta tiedostoon"
 
 # "Alkuun listtv tiedosto" olisi vrinpin.
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Mink tiedoston alkuun"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Mink tiedoston loppuun"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Kirjoitettava tiedosto"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Tiedosto olemassa, korvataanko?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -456,33 +456,33 @@ msgstr "Seuraava tiedosto"
 msgid "Go To Line"
 msgstr "Rivinumero"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Tasaa nykyinen kappale"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Sulje nykyinen ladattu tiedosto/Poistu Nanosta"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Tasaa nykyinen kappale"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Lis toinen tiedosto nykyiseen tiedostoon"
@@ -767,232 +767,232 @@ msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Kirjoita"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Tasaa"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Lue tied."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Leikkaa"
 
 # 80 sarakkeen nytll mahtuu 10 merkki, mieluummin 9.
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Eptasaa"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Liit"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Sijainti"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Oikolue"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Merkitse teksti"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Leikkaa"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Leikkaa"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Liit"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Eteenpin"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Seuraava sana"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Edellinen sana"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Ed. sivu"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Seuraava tiedosto"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "End"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Etsi toinen sulje"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Edellinen tiedosto"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Seuraava tiedosto"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Poista"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Nyt kohdistimen sijainti aina"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Pehme vieritys"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Vrillinen rakenteen merkint"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Varmuuskopio"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Useat puskurit"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ei muunnosta DOS/Mac-muodosta"
 
 # Pern tulee "kytss" tai "ei kytss".
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Keskeytysnppin"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1017,7 +1017,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Etsi-tilassa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1026,7 +1026,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1045,7 +1045,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Etsi rivinumero -tilassa:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1077,7 +1077,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Lue tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1086,7 +1086,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1115,7 +1115,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Kirjoita tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1141,7 +1141,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss tiedostoselaimessa:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1167,13 +1167,13 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Etsi-tilassa:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1197,7 +1197,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Siirry hakemistoon -tilassa:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1222,7 +1222,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Oikolue-tilassa:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1243,7 +1243,7 @@ msgstr ""
 " Seuraavat funktionppimet ovat kytss Suorita komento -tilassa:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1272,7 +1272,7 @@ msgstr ""
 "sulkeissa:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1283,7 +1283,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1292,7 +1292,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "plle/pois"
 
@@ -1698,7 +1698,7 @@ msgstr "parametri %s sis
 msgid "Regex strings must begin and end with a \" character"
 msgstr "snnllisten lausekkeiden on alettava ja loputtava \"-merkill\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Snnllinen lauseke \"%s\" ei kelpaa: %s"
@@ -1908,9 +1908,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Lis levyll olevan tiedoston loppuun"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1944,7 +1944,7 @@ msgid "text replace"
 msgstr " (korvattava)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1957,7 +1957,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1978,7 +1978,7 @@ msgid "Could not fork"
 msgstr "Ei voitu tehd lapsiprosessia"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2047,7 +2047,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Lis valinta tiedoston loppuun"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "Nanolta loppui muisti!"
 
@@ -2057,62 +2057,62 @@ msgstr "Nanolta loppui muisti!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " Muokattu "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " Nkym "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " HAKEMISTO: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Tiedosto: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "rivi %ld/%ld (%d%%), sarake %lu/%lu (%d%%), merkki %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Nano-editori"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "versio "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Erikoiskiitokset:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
 # Special thanks to: (nimi) For ncurses: (nimi)
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Kiitos Nanon kyttmisest!\n"
diff --git a/po/fr.po b/po/fr.po
@@ -10,10 +10,10 @@
 # Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.3\n"
+"Project-Id-Version: nano 2.1.5pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
-"PO-Revision-Date: 2008-08-06 23:39+0200\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
+"PO-Revision-Date: 2008-08-25 02:11+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -46,7 +46,7 @@ msgstr "Changer de répertoire"
 # File: src/search.c, line: 212
 # File: src/search.c, line: 934
 # File: src/search.c, line: 995
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Annulé"
@@ -92,8 +92,8 @@ msgstr "En mode restreint, sortir de %s est impossible"
 # File: src/rcfile.c, line: 913
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -112,13 +112,13 @@ msgstr "Impossible de passer au répertoire supérieur"
 # File: src/browser.c, line: 569
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(rép.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(remonter)"
 
@@ -127,7 +127,7 @@ msgstr "(remonter)"
 # File: src/search.c, line: 179
 # File: src/browser.c, line: 651
 # File: src/search.c, line: 179
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Recherche"
 
@@ -138,7 +138,7 @@ msgstr "Recherche"
 # File: src/search.c, line: 183
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Resp. casse]"
 
@@ -149,7 +149,7 @@ msgstr " [Resp. casse]"
 # File: src/search.c, line: 189
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Exp. ration.]"
 
@@ -160,7 +160,7 @@ msgstr " [Exp. ration.]"
 # File: src/search.c, line: 195
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Arrière]"
 
@@ -171,7 +171,7 @@ msgstr " [Arrière]"
 # File: src/browser.c, line: 760
 # File: src/browser.c, line: 768
 # File: src/search.c, line: 369
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "La recherche a fait le tour"
 
@@ -188,7 +188,7 @@ 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:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
@@ -198,7 +198,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:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Aucun de motif de recherche défini"
 
@@ -232,7 +232,7 @@ msgstr "Basculement vers %s"
 # File: src/files.c, line: 245
 # File: src/global.c, line: 302
 # File: src/winio.c, line: 2022
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
@@ -300,7 +300,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:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -314,7 +314,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:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -388,9 +388,9 @@ msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
 #: src/files.c:1477 src/files.c:1502 src/files.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erreur d'écriture du fichier temporaire : %s"
+msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
 
 #
 # File: src/files.c, line: 1374
@@ -430,7 +430,7 @@ msgstr "Trop de copies de sécurité ?"
 # File: src/files.c, line: 2458
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
@@ -450,7 +450,7 @@ msgstr "Erreur d'écriture du fichier temporaire : %s"
 #
 # File: src/files.c, line: 1651
 # File: src/files.c, line: 1651
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -460,84 +460,84 @@ msgstr[1] "%lu lignes écrites"
 #
 # File: src/files.c, line: 1751
 # File: src/files.c, line: 1751
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
 #
 # File: src/files.c, line: 1752
 # File: src/files.c, line: 1752
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
 #
 # File: src/files.c, line: 1754
 # File: src/files.c, line: 1754
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Copie de sécurité]"
 
 #
 # File: src/files.c, line: 1758
 # File: src/files.c, line: 1758
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Ajouter la sélection au début d'un fichier"
 
 #
 # File: src/files.c, line: 1759
 # File: src/files.c, line: 1759
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Ajouter la sélection à la fin d'un fichier"
 
 #
 # File: src/files.c, line: 1760
 # File: src/files.c, line: 1760
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Écrire la sélection dans un fichier"
 
 #
 # File: src/files.c, line: 1763
 # File: src/files.c, line: 1763
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nom du fichier au tête duquel ajouter"
 
 #
 # File: src/files.c, line: 1764
 # File: src/files.c, line: 1764
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nom du fichier à la fin duquel ajouter"
 
 #
 # File: src/files.c, line: 1765
 # File: src/files.c, line: 1765
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nom du fichier à écrire"
 
 #
 # File: src/files.c, line: 1856
 # File: src/files.c, line: 1856
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Le fichier existe, VOULEZ-VOUS L'ÉCRASER ? "
 
 #
 # File: src/files.c, line: 1871
 # File: src/files.c, line: 1871
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
 #
 # File: src/files.c, line: 2298
 # File: src/files.c, line: 2298
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(suite)"
 
@@ -546,7 +546,7 @@ msgstr "(suite)"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -802,50 +802,50 @@ msgid "Go To Line"
 msgstr "Aller lig."
 
 #
+# File: src/global.c, line: 325
+# File: src/global.c, line: 325
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justifier le paragraphe courant"
+
+#
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Annuler la fonction courante"
 
 #
 # File: src/global.c, line: 315
 # File: src/global.c, line: 315
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Affiche de message"
 
 #
 # File: src/global.c, line: 318
 # File: src/global.c, line: 318
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fermer l'espace en cours / Quitter nano"
 
 #
 # File: src/global.c, line: 320
 # File: src/global.c, line: 320
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Quitter nano"
 
 #
 # File: src/global.c, line: 324
 # File: src/global.c, line: 324
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Écrire le fichier en cours sur le disque"
 
 #
-# File: src/global.c, line: 325
-# File: src/global.c, line: 325
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justifier le paragraphe courant"
-
-#
 # File: src/global.c, line: 327
 # File: src/global.c, line: 327
 #: src/global.c:504
@@ -1267,7 +1267,7 @@ msgstr "Changer de répertoire"
 # File: src/global.c, line: 477
 # File: src/global.c, line: 477
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Fermer"
 
@@ -1275,7 +1275,7 @@ msgstr "Fermer"
 # File: src/global.c, line: 483
 # File: src/global.c, line: 483
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Écrire"
 
@@ -1283,7 +1283,7 @@ msgstr "Écrire"
 # File: src/global.c, line: 488
 # File: src/global.c, line: 488
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justifier"
 
@@ -1291,7 +1291,7 @@ msgstr "Justifier"
 # File: src/global.c, line: 505
 # File: src/global.c, line: 505
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Lire fich."
 
@@ -1299,7 +1299,7 @@ msgstr "Lire fich."
 # File: src/global.c, line: 528
 # File: src/global.c, line: 528
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Couper"
 
@@ -1307,7 +1307,7 @@ msgstr "Couper"
 # File: src/global.c, line: 534
 # File: src/global.c, line: 534
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Dé-justif."
 
@@ -1315,7 +1315,7 @@ msgstr "Dé-justif."
 # File: src/global.c, line: 539
 # File: src/global.c, line: 539
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Coller"
 
@@ -1323,7 +1323,7 @@ msgstr "Coller"
 # File: src/global.c, line: 544
 # File: src/global.c, line: 544
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos. cur."
 
@@ -1331,71 +1331,71 @@ msgstr "Pos. cur."
 # File: src/global.c, line: 552
 # File: src/global.c, line: 552
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Orthograp."
 
 #
 # File: src/global.c, line: 575
 # File: src/global.c, line: 575
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marquer"
 
 #
 # File: src/global.c, line: 583
 # File: src/global.c, line: 583
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Copier"
 
 #
 # File: src/global.c, line: 587
 # File: src/global.c, line: 587
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Indenter"
 
 #
 # File: src/global.c, line: 591
 # File: src/global.c, line: 591
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Supprimer l'indentation"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr "Refaire"
 
 #
 # File: src/global.c, line: 596
 # File: src/global.c, line: 596
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "En avant"
 
 #
 # File: src/global.c, line: 600
 # File: src/global.c, line: 600
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "En arrière"
 
 #
 # File: src/global.c, line: 605
 # File: src/global.c, line: 605
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Mot suivant"
 
 #
 # File: src/global.c, line: 609
 # File: src/global.c, line: 609
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Mot précédent"
 
@@ -1404,7 +1404,7 @@ msgstr "Mot précédent"
 # File: src/global.c, line: 1083
 # File: src/global.c, line: 614
 # File: src/global.c, line: 1083
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Ligne préc."
 
@@ -1413,56 +1413,56 @@ msgstr "Ligne préc."
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Ligne suiv."
 
 #
 # File: src/global.c, line: 622
 # File: src/global.c, line: 622
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Début doc."
 
 #
 # File: src/global.c, line: 626
 # File: src/global.c, line: 626
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fin"
 
 #
 # File: src/global.c, line: 649
 # File: src/global.c, line: 649
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Trouver l'autre crochet"
 
 #
 # File: src/global.c, line: 653
 # File: src/global.c, line: 653
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Remonter"
 
 #
 # File: src/global.c, line: 657
 # File: src/global.c, line: 657
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Descendre"
 
 #
 # File: src/global.c, line: 663
 # File: src/global.c, line: 663
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Fichier précédent"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Fichier suivant"
 
@@ -1473,70 +1473,70 @@ msgstr "Fichier suivant"
 # File: src/text.c, line: 2431
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Entrée telle quelle"
 
 #
 # File: src/global.c, line: 677
 # File: src/global.c, line: 677
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabulation"
 
 #
 # File: src/global.c, line: 681
 # File: src/global.c, line: 681
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Entrée"
 
 #
 # File: src/global.c, line: 685
 # File: src/global.c, line: 685
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Supprimer"
 
 #
 # File: src/global.c, line: 689
 # File: src/global.c, line: 689
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "RetourArr."
 
 #
 # File: src/global.c, line: 281
 # File: src/global.c, line: 281
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
 #
 # File: src/global.c, line: 710
 # File: src/global.c, line: 710
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Nombre de mots "
 
 #
 # File: src/global.c, line: 1277
 # File: src/global.c, line: 1277
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mode aide"
 
 #
 # File: src/global.c, line: 1280
 # File: src/global.c, line: 1280
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Afficher la position du curseur"
 
 #
 # File: src/global.c, line: 1283
 # File: src/global.c, line: 1283
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
@@ -1545,98 +1545,98 @@ msgstr "Utiliser 1 ligne de plus pour l'édition"
 # File: src/nano.c, line: 776
 # File: src/global.c, line: 1285
 # File: src/nano.c, line: 776
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Défilement progressif"
 
 #
 # File: src/global.c, line: 1294
 # File: src/global.c, line: 1294
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
 #
 # File: src/global.c, line: 1304
 # File: src/global.c, line: 1304
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Colorisation syntaxique"
 
 #
 # File: src/global.c, line: 1308
 # File: src/global.c, line: 1308
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/global.c, line: 1311
 # File: src/global.c, line: 1311
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
 #
 # File: src/global.c, line: 1314
 # File: src/global.c, line: 1314
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Couper jusqu'en fin de ligne"
 
 #
 # File: src/global.c, line: 1318
 # File: src/global.c, line: 1318
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Passer à la ligne automatiquement"
 
 #
 # File: src/global.c, line: 1323
 # File: src/global.c, line: 1323
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
 #
 # File: src/global.c, line: 1334
 # File: src/global.c, line: 1334
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Conserver des copies de sécurité"
 
 #
 # File: src/global.c, line: 1342
 # File: src/global.c, line: 1342
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Mode multi-espace"
 
 #
 # File: src/global.c, line: 1346
 # File: src/global.c, line: 1346
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
 #
 # File: src/global.c, line: 1354
 # File: src/global.c, line: 1354
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Pas de conversion des formats DOS et Mac"
 
 #
 # File: src/global.c, line: 1360
 # File: src/global.c, line: 1360
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
 #
 # File: src/help.c, line: 228
 # File: src/help.c, line: 228
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 #
 # File: src/help.c, line: 237
 # File: src/help.c, line: 237
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1679,7 +1679,7 @@ msgstr ""
 #
 # File: src/help.c, line: 243
 # File: src/help.c, line: 243
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1703,7 +1703,7 @@ msgstr ""
 #
 # File: src/help.c, line: 252
 # File: src/help.c, line: 252
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1730,7 +1730,7 @@ msgstr ""
 #
 # File: src/help.c, line: 261
 # File: src/help.c, line: 261
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1749,7 +1749,7 @@ msgstr ""
 #
 # File: src/help.c, line: 267
 # File: src/help.c, line: 267
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1782,7 +1782,7 @@ msgstr ""
 #
 # File: src/help.c, line: 281
 # File: src/help.c, line: 281
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1812,7 +1812,7 @@ msgstr ""
 #
 # File: src/help.c, line: 294
 # File: src/help.c, line: 294
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1839,7 +1839,7 @@ msgstr ""
 #
 # File: src/help.c, line: 303
 # File: src/help.c, line: 303
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1851,7 +1851,7 @@ msgstr ""
 #
 # File: src/help.c, line: 307
 # File: src/help.c, line: 307
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1878,7 +1878,7 @@ msgstr ""
 #
 # File: src/help.c, line: 320
 # File: src/help.c, line: 320
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1906,7 +1906,7 @@ msgstr ""
 #
 # File: src/help.c, line: 335
 # File: src/help.c, line: 335
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1931,7 +1931,7 @@ msgstr ""
 #
 # File: src/help.c, line: 348
 # File: src/help.c, line: 348
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1955,7 +1955,7 @@ msgstr ""
 #
 # File: src/help.c, line: 359
 # File: src/help.c, line: 359
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1978,7 +1978,7 @@ msgstr ""
 #
 # File: src/help.c, line: 366
 # File: src/help.c, line: 366
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1998,7 +1998,7 @@ msgstr ""
 # File: src/help.c, line: 551
 # File: src/help.c, line: 397
 # File: src/help.c, line: 551
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "(commutateur)"
 
@@ -2644,7 +2644,7 @@ msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 # File: src/search.c, line: 62
 # File: src/rcfile.c, line: 226
 # File: src/search.c, line: 62
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "mauvaise expr. rationnelle « %s » : %s"
@@ -2964,12 +2964,12 @@ msgstr "Marque enlevée"
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
-#
-# File: src/global.c, line: 314
-# File: src/global.c, line: 314
 #: src/text.c:389 src/text.c:523
-msgid "Couldnt match current undo line"
-msgstr "Impossible de trouver la ligne d'annulation"
+#, 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. "
+"Sauvegardez votre travail"
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -3011,8 +3011,8 @@ msgid "text replace"
 msgstr "remplacement de texte"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
-msgstr "euh..."
+msgid "Internal error: unknown type.  Please save your work"
+msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
 
 #: src/text.c:492
 #, c-format
@@ -3024,8 +3024,10 @@ msgid "Nothing to re-do!"
 msgstr "Rien à refaire !"
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
-msgstr "Impossible de trouver une opération annulée à refaire."
+msgid "Internal error: Redo setup failed.  Please save your work"
+msgstr ""
+"Erreur interne : impossible de se préparer à refaire l'action. Sauvegardez "
+"votre travail"
 
 #: src/text.c:579
 msgid "line cut"
@@ -3055,10 +3057,8 @@ msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
-msgstr ""
-"Aïe. J'ai essayé d'ajouter une chose inconnue à la pile d'annulation. Vous "
-"devriez sauvegarder votre travail."
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
 
 #
 # File: src/text.c, line: 1270
@@ -3175,7 +3175,7 @@ msgstr "Contenu de la sélection : "
 # File: src/utils.c, line: 377
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano n'a plus de mémoire !"
 
@@ -3193,7 +3193,7 @@ msgstr "Entrée Unicode"
 # File: src/winio.c, line: 2007
 # File: src/winio.c, line: 2004
 # File: src/winio.c, line: 2007
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modifié"
 
@@ -3203,28 +3203,28 @@ msgstr "Modifié"
 # déborder sur le bord haut de l'écran.
 # File: src/winio.c, line: 2005
 # File: src/winio.c, line: 2005
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Voir"
 
 #
 # File: src/winio.c, line: 2018
 # File: src/winio.c, line: 2018
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "RÉP. :"
 
 #
 # File: src/winio.c, line: 2025
 # File: src/winio.c, line: 2025
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fichier :"
 
 #
 # File: src/winio.c, line: 3046
 # File: src/winio.c, line: 3046
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
@@ -3232,55 +3232,55 @@ msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
 #
 # File: src/winio.c, line: 3166
 # File: src/winio.c, line: 3166
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "L'éditeur de texte nano"
 
 #
 # File: src/winio.c, line: 3167
 # File: src/winio.c, line: 3167
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "version"
 
 #
 # File: src/winio.c, line: 3168
 # File: src/winio.c, line: 3168
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
 #
 # File: src/winio.c, line: 3169
 # File: src/winio.c, line: 3169
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
 #
 # File: src/winio.c, line: 3170
 # File: src/winio.c, line: 3170
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
 #
 # File: src/winio.c, line: 3171
 # File: src/winio.c, line: 3171
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
 #
 # File: src/winio.c, line: 3172
 # File: src/winio.c, line: 3172
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "et toute autre personne que nous aurions oublié..."
 
 #
 # File: src/winio.c, line: 3173
 # File: src/winio.c, line: 3173
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
diff --git a/po/ga.po b/po/ga.po
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.2\n"
+"Project-Id-Version: nano 2.1.5pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
-"PO-Revision-Date: 2008-06-25 10:17-0500\n"
-"Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
+"PO-Revision-Date: 2008-08-21 08:43-0500\n"
+"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Cealaithe"
@@ -33,8 +33,8 @@ msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
@@ -46,48 +46,48 @@ msgstr "Ní féidir dul go dtí an chomhadlann thuas"
 # max 7 with parens on 80 col screen --kps
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "cmhdlnn"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "téigh suas"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Cuardaigh"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Cásíogair]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Slonn]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Siar]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Thimfhill an Cuardach"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Níor aimsíodh an patrún in aon áit eile"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
@@ -105,7 +105,7 @@ msgstr "Níl aon mhaoláin oscailte fágtha"
 msgid "Switched to %s"
 msgstr "Athraithe go %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
@@ -158,12 +158,12 @@ msgstr "Comhad Nua"
 msgid "\"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
@@ -208,9 +208,9 @@ msgstr ""
 "nofollow socraithe"
 
 #: src/files.c:1477 src/files.c:1502 src/files.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Earráid agus comhad sealadach á scríobh: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
 #: src/files.c:1478 src/nano.c:675
 msgid "Too many backup files?"
@@ -218,7 +218,7 @@ msgstr "An iomarca comhad cúltaca?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
@@ -228,7 +228,7 @@ msgstr "Earráid agus %s á scríobh: %s"
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -238,55 +238,55 @@ msgstr[2] "Scríobhadh %lu líne"
 msgstr[3] "Scríobhadh %lu líne"
 msgstr[4] "Scríobhadh %lu líne"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Formáid DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Formáid Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Cúltaca]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Réamhcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Iarcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Scríobh an Roghnúchán i gComhad"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Comhad is mian leat Réamhcheangal leis"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Comhad is mian leat Iarcheangal leis"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Ainm Comhaid le Scríobh"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Tá an comhad ann; FORSCRÍOBH ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -437,32 +437,32 @@ msgstr "Ionsáigh Comhad"
 msgid "Go To Line"
 msgstr "Téigh Go Líne"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Comhfhadaigh an t-alt reatha"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Scoir nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Scríobh an comhad reatha ar an diosca"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Comhfhadaigh an t-alt reatha"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Ionsáigh comhad eile isteach sa cheann reatha"
@@ -525,11 +525,11 @@ msgstr "Dí-eangaigh an líne reatha"
 
 #: src/global.c:527
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Cealaigh an oibríocht is déanaí"
 
 #: src/global.c:528
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
 #: src/global.c:530
 msgid "Go forward one character"
@@ -637,7 +637,7 @@ msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
 #: src/global.c:587
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "Cuir an t-eagarthóir ar fionraí (más feidir)"
+msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
 #: src/global.c:590
 msgid "Toggle the case sensitivity of the search"
@@ -711,221 +711,221 @@ msgstr "Téigh go comhadlann"
 # 10 characters fit, but with no space before next option
 # I'm assuming an 80 column terminal here
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Dún"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Scríobh"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Comhfhadú"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Léigh"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Gearr"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "DíComhfhdú"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "DíGhearr Téacs"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Litreoir"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marcáil Téacs"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Cóipeáil Téacs"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Eangaigh Téacs"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Dí-eangaigh Téacs"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
-msgstr ""
+msgstr "Cealaigh"
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
-msgstr ""
+msgstr "Athdhéan"
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Ar Aghaidh"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "An Chéad Fhocal Eile"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "An Focal Roimhe Seo"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "An Chéad Líne Eile"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Aimsigh an Lúibín Eile"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Scrollaigh Suas"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Scrollaigh Síos"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "An Comhad Roimhe Seo"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "An Chéad Chomhad Eile"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Ionchur Litriúil"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Scrios"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Cúlspás"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Líon na bhFocal"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Mínscrollú"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
-msgstr "Taispeáint spáis báin"
+msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Timfhilleadh líne"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Comhaid chúltaca"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Maoláin iomadúla"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -947,7 +947,7 @@ msgstr ""
 "na leide chuardaigh.  Má bhrúnn tú \"Enter\" gan aon téacs, déanfar an "
 "cuardach céanna arís.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -961,7 +961,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód Cuardaigh:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -981,7 +981,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Téigh Go Líne\":\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1004,7 +1004,7 @@ msgstr ""
 "comhad ionsáite  i maolán ar leith (úsáid Meta-< agus > chun bogadh idir "
 "maoláin oscailte).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1015,7 +1015,7 @@ msgstr ""
 "Má theastaíonn tú maolán folamh nua, ná hiontráil ainm comhaid, is é sin nó "
 "iontráil ainm de chomhad nach ann agus brúigh \"Enter\".\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1043,7 +1043,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Scríobh Comhad\":\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1065,7 +1065,7 @@ msgstr ""
 "chomhadlann aibhsithe.  Roghnaigh an chomhadlann darb ainm \"..\" ag barr "
 "liosta na gcomhad chun dul suas leibhéal amháin.\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 "cuardach céanna arís.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1098,7 +1098,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil i mód an Litreora:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1166,7 +1166,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Rith Ordú\":\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1187,7 +1187,7 @@ msgstr ""
 "an comhad atá in eagar.  Taispeántar teachtaireachtaí tábhachtacha ar an "
 "líne stádais, an tríú líne ó bhun an scáileáin.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 "tsiombail Meta (M-), agus is féidir iad féin a iontráil le ceann de Esc, "
 "Alt, nó Meta, ag brath ar shocruithe do mhéarchlár.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1215,11 +1215,11 @@ msgid ""
 msgstr ""
 "Má bhrúnn tú Esc faoi dhó agus ansin iontrálann tú uimhir dheachúlach le trí "
 "dhigit, idir 000 agus 255, gheobhaidh tú an beart leis an luach sin.  Tá na "
-"heochracha a leanas ar fáil i bpríomhfhuinneog an eagarthóra.  Taispeántar "
-"eochracha malartacha idir lúibíní:\n"
+"heochracha seo a leanas ar fáil i bpríomhfhuinneog an eagarthóra.  "
+"Taispeántar eochracha malartacha idir lúibíní:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "(cumasú/díchumasú)"
 
@@ -1598,7 +1598,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Ní mór carachtar \" a bheith ag tosach agus ag deireadh sloinn ionadaíochta"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
@@ -1804,69 +1804,68 @@ msgstr "Díshocraíodh Marc"
 
 #: src/text.c:377
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Níl faic le cealú!"
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Eangaigh an líne reatha"
+#, 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:400 src/text.c:533
 msgid "text add"
-msgstr ""
+msgstr "téacs a chur leis"
 
 #: src/text.c:409 src/text.c:543
-#, fuzzy
 msgid "text delete"
-msgstr "An Chéad Chomhad Eile"
+msgstr "téacs a scriosadh"
 
 #: src/text.c:422 src/text.c:552
 msgid "line split"
-msgstr ""
+msgstr "líne a scoilt"
 
 #: src/text.c:433 src/text.c:563
 msgid "line join"
-msgstr ""
+msgstr "líne a cheangal"
 
 #: src/text.c:445
 msgid "text cut"
-msgstr ""
+msgstr "téacs a ghearradh"
 
 #: src/text.c:463 src/text.c:624
-#, fuzzy
 msgid "text insert"
-msgstr "An Chéad Líne Eile"
+msgstr "téacs a ionsá"
 
 #: src/text.c:481 src/text.c:618
-#, fuzzy
 msgid "text replace"
-msgstr " (le cur in ionad)"
+msgstr "téacs a ionadú"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work"
+msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre"
 
 #: src/text.c:492
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Cealaíodh gníomh (%s)"
 
 #: src/text.c:508
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Níl faic le hathdhéanamh!"
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
+"Earráid inmheánach: Theip ar shocrú athdhéanta.  Sábháil do chuid oibre"
 
 #: src/text.c:579
 msgid "line cut"
-msgstr ""
+msgstr "líne a ghearradh"
 
 #: src/text.c:638
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Athrinneadh gníomh (%s)"
 
 #: src/text.c:727
 msgid "Could not pipe"
@@ -1877,8 +1876,8 @@ msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre."
 
 #: src/text.c:1784
 #, c-format
@@ -1945,7 +1944,7 @@ msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "cuimhne nano ídithe!"
 
@@ -1955,59 +1954,73 @@ msgstr "cuimhne nano ídithe!"
 msgid "Unicode Input"
 msgstr "Ionchur Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Athraithe"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Amharc"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Comhad:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "líne %ld/%ld (%d%%), colún %lu/%lu (%d%%), carachtar %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Go raibh maith agat as úsáid nano!"
 
+#~ msgid "Couldnt match current undo line"
+#~ msgstr "Níorbh fhéidir an líne reatha cealaithe a mheaitseáil"
+
+#~ msgid "wtf?"
+#~ msgstr "cad sa diabhal?"
+
+#~ msgid "Can't find previous undo to re-do, argh"
+#~ msgstr "Níl aon oibríocht chealaithe ann le hathdhéanamh, faraor"
+
+#~ msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+#~ msgstr ""
+#~ "Faraor, baineadh triail as rud anaithnid a chur leis an struchtúr "
+#~ "cealaithe - ba chóir duit do chuid oibre a shábháil"
+
 #~ msgid "Space"
 #~ msgstr "Spás"
 
diff --git a/po/gl.po b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2006-10-14 05:01+0200\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@members.fsf.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Cancelado"
@@ -32,8 +32,8 @@ msgstr "Non se pode saír de %s no modo restrinxido"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s : %s"
@@ -44,48 +44,48 @@ msgstr "Non se pode ascender por un directorio"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(dir pai)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Busca"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Sensible ás Maiúsculas/Minúsculas]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [ExpReg]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Cara a Atrás]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Esta é a única aparición"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
@@ -103,7 +103,7 @@ msgstr "Non hai máis ficheiros abertos"
 msgid "Switched to %s"
 msgstr "Cambiouse a %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Novo Buffer"
 
@@ -144,12 +144,12 @@ msgstr "Ficheiro Novo"
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
@@ -204,7 +204,7 @@ msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro escribindo %s: %s"
@@ -214,62 +214,62 @@ msgstr "Erro escribindo %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escribiuse %lu liña"
 msgstr[1] "Escribíronse %lu liñas"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [CopiaSeg]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Principio"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Engadir a Selección ó Ficheiro"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Gravar a Selección no Ficheiro"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Ficheiro ó que Engadir polo Principio"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Ficheiro ó que Engadir"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Ficheiro a Gravar"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "O ficheiro xa existe, ¿SOBRESCRIBIR?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE?"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(máis)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -419,32 +419,32 @@ msgstr "Insertar Ficheiro"
 msgid "Go To Line"
 msgstr "Ir Á Liña"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Xustifica-lo parágrafo actual"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Amosar esta axuda"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Pecha-lo ficheiro cargado actualmente/Saír de nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Xustifica-lo parágrafo actual"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
@@ -705,221 +705,221 @@ msgid "Go to directory"
 msgstr "Ir ó directorio"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Pechar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Gravar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Xustif"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Ler Fich"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Cortar Txt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Des-Xust"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Pegar Txt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos Act"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ortografía"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Copiar"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Sangrar"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "De-sangrar"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Adiante"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Verba Seguinte"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Verba Anterior"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Liña Ant"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Liña Seg"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Busca-la Parella"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Desprazar arriba"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Desprazar abaixo"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Seguinte Ficheiro"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Entrada literal"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "Cortar Fin"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Conta verbas"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo axuda"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uso dunha liña máis para editar"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desprazamento suave"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Resaltado de sintaxe con cores"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tecla 'smart home'"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Cortar ata a fin"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Axuste de liñas longas"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Facer Copia Seg"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Múltiples buffers de ficheiro"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Soporte de rato"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Sen conversión do formato DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Suspender"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -940,7 +940,7 @@ msgstr ""
 " Vaise amosa-la cadea de busca anterior en corchetes despois do indicativo "
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior. "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -954,7 +954,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles en modo Busca:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -974,7 +974,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles no modo Ir Á Liña:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -997,7 +997,7 @@ msgstr ""
 "se cargue nun buffer separado (empregue Meta-< e > para cambiar entre "
 "buffers de ficheiro). "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1013,7 +1013,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1042,7 +1042,7 @@ msgstr ""
 "Ficheiros:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1068,7 +1068,7 @@ msgstr ""
 "ficheiros:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1091,7 +1091,7 @@ msgstr ""
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1100,7 +1100,7 @@ msgstr ""
 "Busca:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1123,7 +1123,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1147,7 +1147,7 @@ msgstr ""
 " Existen as seguintes funcións no modo Corrector Ortográfico:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1169,7 +1169,7 @@ msgstr ""
 "Externos:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1189,7 +1189,7 @@ msgstr ""
 "principal do editor, que amosa o ficheiro que se edita. A liña de estado é a "
 "terceira liña dende o fondo e amosa as mensaxes importantes. "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1209,7 +1209,7 @@ msgstr ""
 "introducidas usando as teclas Esc, Alt ou Meta dependendo da configuración "
 "do seu teclado. "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1223,7 +1223,7 @@ msgstr ""
 "alternativas son amosadas entre parénteses:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
@@ -1601,7 +1601,7 @@ msgstr "O argumento %s ten un \" sen rematar"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "As cadeas de expresión regular deben comezar e rematar cun carácter \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
@@ -1806,9 +1806,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Sangra-la liña actual"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1842,7 +1842,7 @@ msgid "text replace"
 msgstr " (para substituír)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1855,7 +1855,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1876,7 +1876,7 @@ msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1944,7 +1944,7 @@ msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "¡A nano esgotóuselle a memoria!"
 
@@ -1954,56 +1954,56 @@ msgstr "¡A nano esgotóuselle a memoria!"
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "liña %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
diff --git a/po/hu.po b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-05-12 01:41+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Megszakítva"
@@ -35,8 +35,8 @@ msgstr "Korlátozott módban nem léphet ki a következőből: %s"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
@@ -47,48 +47,48 @@ msgstr "Nem lehet egy könyvtárral feljebb lépni"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(könyvtár)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Keresés"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [kis/Nagy]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Vissza]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "A keresés körbeért"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Ez az egyetlen előfordulás"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
@@ -106,7 +106,7 @@ msgstr "Nincs több nyitott fájlpuffer"
 msgid "Switched to %s"
 msgstr "Átváltva erre: %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Új puffer"
 
@@ -147,12 +147,12 @@ msgstr "Új fájl"
 msgid "\"%s\" not found"
 msgstr "„%s” nem található"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s” egy könyvtár"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s” egy eszközfájl"
@@ -207,7 +207,7 @@ msgstr "Túl sok biztonsági mentés van?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s” írása közben: %s"
@@ -217,62 +217,62 @@ msgstr "Hiba „%s” írása közben: %s"
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu sor kiírva"
 msgstr[1] "%lu sor kiírva"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS formátum]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac formátum]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Biztonsági mentés]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "A kiválasztott rész beszúrása a szöveg elé"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "A kiválasztott rész hozzáfűzése a fájlhoz"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "A kiválasztott rész mentése fájlba"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Beszúrás ezen fájl elé"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Hozzáfűzés ehhez a fájlhoz"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Mentés ebbe a fájlba"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "A fájl már létezik, FELÜLÍRJA? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Menti a fájlt MÁS NÉVEN? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(tovább)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -421,32 +421,32 @@ msgstr "Fájl beszúrása"
 msgid "Go To Line"
 msgstr "Ugrás sorra"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Aktuális bekezdés sorkizárttá rendezése"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Aktuális fájlpuffer bezárása/Kilépés a nanoból"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Aktuális bekezdés sorkizárttá rendezése"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Másik fájl beszúrása"
@@ -692,221 +692,221 @@ msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Bezárás"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Mentés"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Sorkizár"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Beolvasás"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Kivágás"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Nem sork."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Beillesztés"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pozíció"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Helyes-e?"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Szövegbehúzás"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Szövegbehúzás megsz."
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Előre"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Köv. szó"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Előző sor"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Köv. sor"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Másik zárójel megkeresése"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Előző fájl"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Következő fájl"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Szó szerinti bevitel"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Eggyel több sor használata a szerkesztéshez"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Egyenletes görgetés"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Hosszú sorok tördelése"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Fájlok biztonsági mentése"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Több fájlpuffer"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -927,7 +927,7 @@ msgstr ""
 " Az előző keresési kifejezés a keresés után zárójelben meg lesz jelenítve. "
 "Új szöveg beírása nélkül Entert ütve az előző keresés lesz megismételve.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -941,7 +941,7 @@ msgstr ""
 " Kereső módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -961,7 +961,7 @@ msgstr ""
 " Sorra ugrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -984,7 +984,7 @@ msgstr ""
 "külön pufferbe fog betöltődni (melyek között a Meta-< és > gombokkal lehet "
 "navigálni).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -998,7 +998,7 @@ msgstr ""
 " Fájlbeszúrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1027,7 +1027,7 @@ msgstr ""
 " Fájlmentés módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1052,7 +1052,7 @@ msgstr ""
 " A fájlböngészőben a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1076,7 +1076,7 @@ msgstr ""
 "kerül megismétlésre.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1084,7 +1084,7 @@ msgstr ""
 " A következő funkcióbillentyűk állnak rendelkezésre keresés módban:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1107,7 +1107,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1132,7 +1132,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1153,7 +1153,7 @@ msgstr ""
 " Parancs-végrehajtási módban a következő billentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1173,7 +1173,7 @@ msgstr ""
 "amely az épp szerkesztett fájl mutatja. Az állapotsor alulról a harmadik "
 "sor, és fontos üzeneteket jelenít meg.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1192,7 +1192,7 @@ msgstr ""
 "sorozatai a Meta (M) szimbólum jelöli és az Esc, Alt vagy Meta billentyűk "
 "egyikével vihető be, a billentyűzet beállításaitól függően.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1206,7 +1206,7 @@ msgstr ""
 "billentyűk zárójelben vannak megjelenítve:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "be/kikapcsolása"
 
@@ -1600,7 +1600,7 @@ msgstr "A(z) „%s” argumentum lezáratlan \" jellel rendelkezik"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "A reguláris kifejezéseknek \" karakterekkel kezdődniük és végződniük"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s”: %s"
@@ -1806,9 +1806,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Aktuális sor behúzása"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1842,7 +1842,7 @@ msgid "text replace"
 msgstr " (cseréhez)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1855,7 +1855,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1876,7 +1876,7 @@ msgid "Could not fork"
 msgstr "Nem forkolható"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1944,7 +1944,7 @@ msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano: elfogyott a memória!"
 
@@ -1954,55 +1954,55 @@ msgstr "nano: elfogyott a memória!"
 msgid "Unicode Input"
 msgstr "Unicode bevitel"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Módosítva"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Nézet"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "sor %ld/%ld (%d%%), oszlop %lu/%lu (%d%%), karakter %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Köszönjük, hogy a nano-t választotta!"
diff --git a/po/id.po b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Dibatalkan"
@@ -33,8 +33,8 @@ msgstr "Tidak dapat keluar %s dalam mode terbatas"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
@@ -45,48 +45,48 @@ msgstr "Tidak dapat memindahkan direktori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Cari"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Pancarian Di-wrapped"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Hanya ini adanya"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr "Tidak ada file yang terbuka lagi"
 msgid "Switched to %s"
 msgstr "Beralih ke %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Buffer baru"
 
@@ -142,12 +142,12 @@ msgstr "File Baru"
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
@@ -204,7 +204,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
@@ -214,62 +214,62 @@ msgstr "Quote string buruk %s: %s"
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Menulis %d baris"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Menulis Pilihan ke File"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nama File untuk di-Tulis"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "File ada, DITIMPA ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -427,33 +427,33 @@ msgstr "File Sesudahnya"
 msgid "Go To Line"
 msgstr "Ke baris"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justifikasi paragraf saat ini"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justifikasi paragraf saat ini"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
@@ -733,230 +733,230 @@ msgid "Go to directory"
 msgstr "Ke Direktori"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Tulis"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justifikasi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Baca File"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Ptng Teks"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "UnJustifikasi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "UnCut Teks"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Mengeja"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "UnCut Teks"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Depan"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Kata Berikut"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Hlm sebelumnya"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "File Sesudahnya"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Cari Kurung Lain"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "File Sesudahnya"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Scrolling halus"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Backup File"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Buffer file multi"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Tidak ada konversi dari format DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -981,7 +981,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -990,7 +990,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1010,7 +1010,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Goto Line:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1041,7 +1041,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Insert File:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1050,7 +1050,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1079,7 +1079,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Write File:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1103,7 +1103,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam file browser:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1129,13 +1129,13 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1158,7 +1158,7 @@ msgstr ""
 "  Kunci-kunci fungsi berikut tersedia di dalam mode Browser GotoDir :\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1183,7 +1183,7 @@ msgstr ""
 "Check:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1203,7 +1203,7 @@ msgstr ""
 " Kunci-kunci berikut tersedia dalam mode ini:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1233,7 +1233,7 @@ msgstr ""
 "ditunjukkan dalam tanda kurung:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1244,7 +1244,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1253,7 +1253,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "enable/disable"
 
@@ -1656,7 +1656,7 @@ msgstr "argumen %s telah selesai.\""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "String regexp harus dimulai dan diakhiri dengan sebuah karakter \"\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
@@ -1862,9 +1862,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Batalkan fungsi ini"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1898,7 +1898,7 @@ msgid "text replace"
 msgstr " (ganti)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1911,7 +1911,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1932,7 +1932,7 @@ msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2001,7 +2001,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano kehabisan memori!"
 
@@ -2011,61 +2011,61 @@ msgstr "nano kehabisan memori!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " Dimodifikasi "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " View "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "File: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), kol %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
diff --git a/po/it.po b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-07-07 11:25+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Annullato"
@@ -33,8 +33,8 @@ msgstr "Impossibile uscire da %s in modalità ristretta"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
@@ -45,49 +45,49 @@ msgstr "Impossibile risalire la directory"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(dir super)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Ricerca"
 
 # FIXME
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Maiuscole/Minuscole]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Espressione regolare]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [All'indietro]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Ricerca ricominciata"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Questa è l'unica occorrenza"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
@@ -105,7 +105,7 @@ msgstr "Nessun altro buffer aperto"
 msgid "Switched to %s"
 msgstr "Spostato a %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nuovo Buffer"
 
@@ -146,12 +146,12 @@ msgstr "Nuovo file"
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di dispositivo"
@@ -204,7 +204,7 @@ msgstr "Troppi file di backup?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
@@ -214,62 +214,62 @@ msgstr "Errore durante la scrittura di %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Scritta %lu riga"
 msgstr[1] "Scritte %lu righe"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Inserisce selezione in testa al file"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Accoda selezione al file"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Salva selezione nel file"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nome del file in cui inserire in testa"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nome del file a cui accodare"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nome del file in cui salvare"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Il file esiste, SOVRASCRIVERE?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvare il file con un NOME DIFFERENTE?"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(ancora)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -422,32 +422,32 @@ msgstr "Inserisci file"
 msgid "Go To Line"
 msgstr "Vai a riga"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Giustifica il paragrafo corrente"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Esce da nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente su disco"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Giustifica il paragrafo corrente"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Inserisce un altro file nel corrente"
@@ -703,224 +703,224 @@ msgid "Go to directory"
 msgstr "Va alla directory"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Salva"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Giustifica"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Inserisci"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Taglia"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "DeGiustif."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Incolla"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Posizione"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ortografia"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Copia"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Indenta"
 
 # FIXME
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Deindenta"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Avanti"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Parola succ."
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Riga Prec."
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Riga Succ."
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Trova la parentesi corrispondente"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "File prec."
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "File succ."
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Input letterale"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
 # FIXME
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
 # FIXME
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Scorrimento continuo"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "A capo automatico"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "File di backup"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "File multipli"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Nessuna conversione dai formati DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Sospensione"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -942,7 +942,7 @@ msgstr ""
 "prompt di ricerca. Premendo Invio senza inserire nulla, verrà eseguita la "
 "ricerca precedente. "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -956,7 +956,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -976,7 +976,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai a Riga:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -999,7 +999,7 @@ msgstr ""
 "provocherà il caricamento in un buffer separato (usare Meta-< e > per "
 "muoversi tra i buffer). "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1013,7 +1013,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Inserisci:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1040,7 +1040,7 @@ msgstr ""
 "\n"
 " Le seguenti funzioni sono disponibili in modalità Salva:\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1064,7 +1064,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili nel file browser\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1097,7 +1097,7 @@ msgstr ""
 "Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1119,7 +1119,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai alla Directory:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Ortografia:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1163,7 +1163,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Esegui comando:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1183,7 +1183,7 @@ msgstr ""
 "mostra il contenuto del file che si sta modificando. La barra di stato è la "
 "terza riga dal basso e mostra importanti messaggi.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "(M) possono essere inserite usato alternativamente il tasto Esc, Alt o Meta, "
 "a seconda della configurazione della tastiera.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1216,7 +1216,7 @@ msgstr ""
 "sequenze alternative sono mostrate tra parentesi:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "abilita/disabilita"
 
@@ -1602,7 +1602,7 @@ msgstr "L'argomento \"%s\" ha un \" non terminato"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
@@ -1810,9 +1810,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Indenta la riga corrente"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1846,7 +1846,7 @@ msgid "text replace"
 msgstr " (sostituisci)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1859,7 +1859,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1880,7 +1880,7 @@ msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1948,7 +1948,7 @@ msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano ha esaurito la memoria!"
 
@@ -1958,56 +1958,56 @@ msgstr "nano ha esaurito la memoria!"
 msgid "Unicode Input"
 msgstr "Input Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Visualizza"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "File:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Riga %ld/%ld (%d%%), colonna %lu/%lu (%d%%), carattere %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Prodotto per voi da:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
diff --git a/po/ms.po b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-04-16 15:28+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Dibatalkan"
@@ -33,8 +33,8 @@ msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
@@ -45,48 +45,48 @@ msgstr "Tidak dapat pindah naik direktori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(dir induk)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Cari"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitif]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Undur]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Hanya inilah sahaja yang dijumpai"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
@@ -104,7 +104,7 @@ msgstr "Tiada lagi buffer fail terbuka"
 msgid "Switched to %s"
 msgstr "Ditukar kepada %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
@@ -141,12 +141,12 @@ msgstr "Fail Baru"
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
@@ -199,7 +199,7 @@ msgstr "Terlalu banyak fail salinan?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
@@ -209,61 +209,61 @@ msgstr "Ralat menulis %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu baris ditulis"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Salinan]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Tambahan Awalan Pilihan ke Fail"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Tambahan Akhiran Pilihan ke Fail"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Tulis Pilihan ke Fail"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nama Fail untuk di Tambah Awalan"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nama Fail untuk di Tambah Akhiran"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Fail telah wujud, TINDIH ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -412,32 +412,32 @@ msgstr "Selit Fail"
 msgid "Go To Line"
 msgstr "Ke Baris"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justifikasi perenggan semasa"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justifikasi perenggan semasa"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Masukkan fail lain ke file semasa"
@@ -685,221 +685,221 @@ msgid "Go to directory"
 msgstr "Pergi ke direktori"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Tulis"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justifikasi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Baca Fail"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Kerat Teks"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "UnJustifikasi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Nyahpotong Teks"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Ke Pengeja"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Teks Indent"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Maju"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Perkataan Selepas"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Baris Terdahulu"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Baris Berikut"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Cari Lain-lain Tanda Kurungan"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Fail Sebelum"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Fail Selepas"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Masukan Verbatim"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Padam"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Gulungan lancar"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Salinan fail"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Buffer fail berganda"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Tiada pertukaran dari format DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -921,7 +921,7 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -935,7 +935,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -955,7 +955,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Pergi Ke Baris:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -978,7 +978,7 @@ msgstr ""
 "menyebabkannya dimuatkan ke dalam buffer berlainan (guna Meta-< dan > untuk "
 "menukar diantara buffer fail)."
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -992,7 +992,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Sisipan Fail:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1020,7 +1020,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Menulis Fail:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1044,7 +1044,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam pelayar fail:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1068,7 +1068,7 @@ msgstr ""
 "carian terdahulu.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1076,7 +1076,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat dalam mod Pencarian Pelayar:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1099,7 +1099,7 @@ msgstr ""
 "  Kekunci fungsi berikut terdapat didalam mod Pelayar Pergi ke Direktori:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1123,7 +1123,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Penyemak Ejaan:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1144,7 +1144,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Laksana Arahan:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "penyunting yang menunjukkan fail yang sedang disunting.  Baris status adalah "
 "baris ketiga dari bawah dan menunjukkan mesej-mesej penting."
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1184,7 +1184,7 @@ msgstr ""
 "menggunakan kekunci Esc, Alt atau Meta bergantung pada tetapan papan kekunci "
 "anda."
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1198,7 +1198,7 @@ msgstr ""
 "dalam kurungan:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "enable/disable"
 
@@ -1576,7 +1576,7 @@ msgstr "Hujah '%s' tiada pengakhiran \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
@@ -1779,9 +1779,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Inden baris semasa"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1815,7 +1815,7 @@ msgid "text replace"
 msgstr " (untuk mengganti)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1828,7 +1828,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1849,7 +1849,7 @@ msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1917,7 +1917,7 @@ msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano tidak cukup memori!"
 
@@ -1927,55 +1927,55 @@ msgstr "nano tidak cukup memori!"
 msgid "Unicode Input"
 msgstr "Masukan Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Lihat"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fail:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), lajur %lu/%lu (%d%%), aksara %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Terima kasih kerana menggunakan nano!"
diff --git 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: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr ""
@@ -33,8 +33,8 @@ msgstr ""
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -45,48 +45,48 @@ msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr ""
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr ""
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr ""
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr ""
 
@@ -145,12 +145,12 @@ msgstr ""
 msgid "\"%s\" not found"
 msgstr ""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
@@ -213,62 +213,62 @@ msgstr ""
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr ""
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr ""
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr ""
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr ""
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr ""
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr ""
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr ""
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr ""
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr ""
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -415,32 +415,32 @@ msgstr ""
 msgid "Go To Line"
 msgstr ""
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr ""
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr ""
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr ""
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr ""
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr ""
@@ -686,221 +686,221 @@ msgid "Go to directory"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr ""
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr ""
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr ""
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr ""
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr ""
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr ""
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr ""
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr ""
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr ""
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr ""
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr ""
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -913,7 +913,7 @@ msgid ""
 "search.  "
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -922,7 +922,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -934,7 +934,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -947,7 +947,7 @@ msgid ""
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -956,7 +956,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -972,7 +972,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -986,7 +986,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1000,13 +1000,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1019,7 +1019,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1033,7 +1033,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1045,7 +1045,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1057,7 +1057,7 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1068,7 +1068,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1077,7 +1077,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr ""
 
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
@@ -1641,7 +1641,8 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-msgid "Couldnt match current undo line"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
 msgstr ""
 
 #: src/text.c:400 src/text.c:533
@@ -1673,7 +1674,7 @@ msgid "text replace"
 msgstr ""
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1686,7 +1687,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1707,7 +1708,7 @@ msgid "Could not fork"
 msgstr ""
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1775,7 +1776,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr ""
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr ""
 
@@ -1785,55 +1786,55 @@ msgstr ""
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr ""
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2006-10-16 23:09+0200\n"
 "Last-Translator: Geir Helland <pjallabais@users.sourceforge.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "G til katalog"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Avbrutt"
@@ -34,8 +34,8 @@ msgstr "Kan ikke g
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Lesefeil p %s: %s"
@@ -46,48 +46,48 @@ msgstr "Kan ikke bevege seg opp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Sk"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Ta hensyn til store/sm bokstaver]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regulrt uttrykk]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Sket gikk rundt"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Dette er eneste forekomst"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Tomt skemnster"
 
@@ -105,7 +105,7 @@ msgstr "Ikke flere 
 msgid "Switched to %s"
 msgstr "Byttet til %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -146,13 +146,13 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "\"%s\" ikke funnet"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er en katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhetsfil (device)"
@@ -206,7 +206,7 @@ msgstr "For mange sikkerhetskopier?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
@@ -216,62 +216,62 @@ msgstr "Skrivefeil %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " {Mac Format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Sikkerhetskopi]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Legg til valgt omrde frst i fil"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Legg til valgt omrde sist i fil"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Skriv valgt omrde til fil"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Filnavn det skal legges til p slutten av"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Filnavn det skal legges til frst i"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Filnavn som skal skrives til"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Filen finnes, SKRIVE OVER ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -421,32 +421,32 @@ msgstr "Sett inn fil"
 msgid "Go To Line"
 msgstr "G til linje"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Juster gjeldende avsnitt"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldende filbuffer/ Avslutt nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Lagre nvrende fil"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Juster gjeldende avsnitt"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Sett inn en annen fil i denne"
@@ -707,221 +707,221 @@ msgid "Go to directory"
 msgstr "G til katalog"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Lagre"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Juster"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Les fil"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Klipp ut"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Avjuster"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Angre \"klipp ut\""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Posisjon"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Indenter"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Angre \"indenter\""
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Fremover"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Neste ord"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Forrige side"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Finn den andre klammen"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Forrige fil"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Neste fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Legg inn ord for ord"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Slett"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Slettetast"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Ls markrposisjon"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Bruk mer plass til editering"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jevn tekstrulling"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Automatisk linjeskift"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Sikkerhetskopier"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Flere filbuffere"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Musesttte"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac format"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -942,7 +942,7 @@ msgstr ""
 "Forrige sketekst vises i braketter etter skepromptet. Trykk linjeskift "
 "uten  skrive inn ny sketekst for  gjenta forrige sk."
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -955,7 +955,7 @@ msgstr ""
 "\n"
 "Flgende funksjonstaster er tilgjengelig i Skemodus:\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -975,7 +975,7 @@ msgstr ""
 "Flgende funksjonstaster er tilgjengelig i G Til Linje modus:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -997,7 +997,7 @@ msgstr ""
 "eller i nanorc filen vil filen som settes inn lastes i et eget buffer. Bruk "
 "Meta-< og > til  bytte mellom buffer."
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1011,7 +1011,7 @@ msgstr ""
 "\n"
 " Flgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1037,7 +1037,7 @@ msgstr ""
 "Flgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1061,7 +1061,7 @@ msgstr ""
 "Flgende funksjonstaster er tilgjengelig i fil-leseren: \n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1083,7 +1083,7 @@ msgstr ""
 "Forrige sketekst vises i braketter etter skepromptet. Trykk linjeskift "
 "uten  skrive inn ny sketekst for  gjenta forrige sk.\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1091,7 +1091,7 @@ msgstr ""
 "Flgende funksjontaster er tilgjengelig i skemodus:\\\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1112,7 +1112,7 @@ msgstr ""
 "\n"
 "Flgende funksjonstaster er definert for G til Dir modus:\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1136,7 +1136,7 @@ msgstr ""
 "Flgende funksjonstaster er definert for stavekontroll modus:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1159,7 +1159,7 @@ msgstr ""
 "Flgende funksjonstaster er definert for Ekstern Kommando modus:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1182,7 +1182,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1201,7 +1201,7 @@ msgstr ""
 "(M) symbolet og kan legges inn med enten Esc, Alt eller Meta tasten, "
 "avhengig av hvordan tastaturoppsettet ditt er."
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1214,7 +1214,7 @@ msgstr ""
 "tilgjengelig i hovedvinduet. Alternative taster viss i parantes:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "skru p/av"
 
@@ -1591,7 +1591,7 @@ msgstr "Atrument '%s' har uterminert \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strenger med reguttrykk m begynne med et \" tegn"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ugyldig reguttrykk \"%s\": %s"
@@ -1796,9 +1796,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Indenter gjeldende linje"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1832,7 +1832,7 @@ msgid "text replace"
 msgstr " ( erstatte)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1845,7 +1845,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1866,7 +1866,7 @@ msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1934,7 +1934,7 @@ msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano er tom for minne!"
 
@@ -1944,57 +1944,57 @@ msgstr "nano er tom for minne!"
 msgid "Unicode Input"
 msgstr "Unikode inndata"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Endret"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Vis"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "KAT: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kolonne %lu/%lu (%d%%), tegn %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Sofware Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
diff --git a/po/nl.po b/po/nl.po
@@ -1,4 +1,4 @@
-# Dutch translations for nano.
+# Dutch translations for nano-2.1.5pre1.
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
@@ -7,10 +7,10 @@
 # Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.1.2\n"
+"Project-Id-Version: nano-2.1.5pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
-"PO-Revision-Date: 2008-06-26 22:46+0200\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
+"PO-Revision-Date: 2008-08-21 22:27+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Geannuleerd"
@@ -35,8 +35,8 @@ msgstr "Kan in beperkte modus niet buiten %s gaan"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout tijdens lezen van %s: %s"
@@ -47,48 +47,48 @@ msgstr "Kan niet naar bovenliggende map gaan"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(map)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(oudermap)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Zoeken"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Hoofdlettergevoelig]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Reg.exp.]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Achterwaarts]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Rondgelopen"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Dit is de enige overeenkomst"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
@@ -106,7 +106,7 @@ msgstr "Geen andere open buffers"
 msgid "Switched to %s"
 msgstr "Overgeschakeld naar %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
@@ -147,12 +147,12 @@ msgstr "Nieuw bestand"
 msgid "\"%s\" not found"
 msgstr "'%s' niet gevonden"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
@@ -195,9 +195,9 @@ msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan met '--nofollow' niet aan een symbolische koppeling toevoegen"
 
 #: src/files.c:1477 src/files.c:1502 src/files.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
+msgstr "Fout tijdens schrijven van tijdelijk bestand %s: %s"
 
 #: src/files.c:1478 src/nano.c:675
 msgid "Too many backup files?"
@@ -205,7 +205,7 @@ msgstr "Te veel reservekopieën?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
@@ -215,62 +215,62 @@ msgstr "Fout tijdens schrijven van %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu regel geschreven"
 msgstr[1] "%lu regels geschreven"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-indeling]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-indeling]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Kopie maken]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Selectie toevoegen vooraan bestand"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Selectie toevoegen achteraan bestand"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Selectie opslaan in bestand"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Vooraan toevoegen aan bestand"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Achteraan toevoegen aan bestand"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Opslaan in bestand"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Bestand bestaat al, OVERSCHRIJVEN? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(meer)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -419,32 +419,32 @@ msgstr "Bestand invoegen"
 msgid "Go To Line"
 msgstr "Naar regel..."
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Huidige alinea uitvullen"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Huidige functie annuleren"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Deze hulptekst tonen"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Huidige buffer sluiten / Nano afsluiten"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Nano afsluiten"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Huidige buffer op schijf opslaan"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Huidige alinea uitvullen"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Een ander bestand in het huidige invoegen"
@@ -507,11 +507,11 @@ msgstr "Huidige regel laten terugspringen"
 
 #: src/global.c:527
 msgid "Undo the last operation"
-msgstr ""
+msgstr "De laatste bewerking ongedaan maken"
 
 #: src/global.c:528
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "De laatst ongedaangemaakte bewerking herdoen"
 
 #: src/global.c:530
 msgid "Go forward one character"
@@ -690,221 +690,221 @@ msgid "Go to directory"
 msgstr "Naar een op te geven map gaan"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Opslaan"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Uitvullen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Inlezen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Knippen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "onUitvullen"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Plakken"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Positie"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Spelling"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Inspringen"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Terugspringen"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
-msgstr ""
+msgstr "Ongedaan maken"
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
-msgstr ""
+msgstr "Herdoen"
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Vooruit"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Woord verder"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Regel terug"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Regel verder"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Naar bijbehorend haakje"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Vorig bestand"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Volgend bestand"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Verbatim invoer"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Extra regel voor bewerkingsvenster"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Per regel scrollen"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Knippen vanaf cursor"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Terugloop van lange regels"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Reservekopieën maken"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Meerdere bestandsbuffers"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Geen omzetting uit DOS/Mac-indeling"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -926,7 +926,7 @@ msgstr ""
 "getoond: op Enter drukken zonder tekst in te voeren herhaalt deze vorige "
 "zoekopdracht.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -940,7 +940,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Zoek/vervang'-modus:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -960,7 +960,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar regel'-modus:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -983,7 +983,7 @@ msgstr ""
 "aparte buffer geladen.  Gebruik dan Meta-< en > om tussen bestandsbuffers te "
 "schakelen.  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -997,7 +997,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand invoegen'-modus:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1025,7 +1025,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand opslaan'-modus:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1050,7 +1050,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestandenlijst'-modus:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1074,7 +1074,7 @@ msgstr ""
 "zoekopdracht.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1082,7 +1082,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand zoeken'-modus:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1104,7 +1104,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar map'-modus:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1129,7 +1129,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Spellingscontrole'-modus:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Externe opdracht'-modus:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1169,7 +1169,7 @@ msgstr ""
 "editvenster waarin het bestand getoond wordt.  De derde regel van onderen is "
 "de statusregel en toont belangrijke berichten.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "worden ingevoerd met Esc of Alt of Meta, afhankelijk van uw "
 "toetsenbordinstelling.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1203,7 +1203,7 @@ msgstr ""
 "(alternatieve toetscombinaties staan tussen haakjes):\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "aan-/uitzetten"
 
@@ -1367,7 +1367,7 @@ msgstr "de statusregel snel wissen"
 
 #: src/nano.c:837
 msgid "Print version information and exit"
-msgstr "versie-informatie tonen en stoppen"
+msgstr "programmaversie tonen en stoppen"
 
 #: src/nano.c:840
 msgid "Detect word boundaries more accurately"
@@ -1584,7 +1584,7 @@ msgstr "Argument '%s' heeft een ongepaarde \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
@@ -1783,69 +1783,66 @@ msgstr "Uitgezet"
 
 #: src/text.c:377
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Er is niets om ongedaan te maken"
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Huidige regel laten inspringen"
+#, 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:400 src/text.c:533
 msgid "text add"
-msgstr ""
+msgstr "teksttoevoeging"
 
 #: src/text.c:409 src/text.c:543
-#, fuzzy
 msgid "text delete"
-msgstr "Volgend bestand"
+msgstr "tekstverwijdering"
 
 #: src/text.c:422 src/text.c:552
 msgid "line split"
-msgstr ""
+msgstr "regelsplitsing"
 
 #: src/text.c:433 src/text.c:563
 msgid "line join"
-msgstr ""
+msgstr "regelsamenvoeging"
 
 #: src/text.c:445
 msgid "text cut"
-msgstr ""
+msgstr "tekstwegneming"
 
 #: src/text.c:463 src/text.c:624
-#, fuzzy
 msgid "text insert"
-msgstr "Regel verder"
+msgstr "tekstinvoeging"
 
 #: src/text.c:481 src/text.c:618
-#, fuzzy
 msgid "text replace"
-msgstr " (om te vervangen)"
+msgstr "tekstvervanging"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work"
+msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
 
 #: src/text.c:492
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Bewerking (%s) is ongedaan gemaakt"
 
 #: src/text.c:508
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Er is niets om opnieuw te doen"
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
-msgstr ""
+msgid "Internal error: Redo setup failed.  Please save your work"
+msgstr "*Interne fout*: kan geen herdoening voorbereiden.  Sla uw werk op."
 
 #: src/text.c:579
 msgid "line cut"
-msgstr ""
+msgstr "regelwegneming"
 
 #: src/text.c:638
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Bewerking (%s) is opnieuw gedaan"
 
 #: src/text.c:727
 msgid "Could not pipe"
@@ -1856,8 +1853,8 @@ msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
-msgstr ""
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
 
 #: src/text.c:1784
 #, c-format
@@ -1924,7 +1921,7 @@ msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "Onvoldoende geheugen beschikbaar voor nano!"
 
@@ -1934,55 +1931,55 @@ msgstr "Onvoldoende geheugen beschikbaar voor nano!"
 msgid "Unicode Input"
 msgstr "Invoer van Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Kijken"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "regel %ld/%ld (%d%%), kolom %lu/%lu (%d%%), teken %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
diff --git a/po/nn.po b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "G til katalog"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Avbrote"
@@ -33,8 +33,8 @@ msgstr "Kan ikkje g
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -45,48 +45,48 @@ msgstr "Kan ikkje skifta til foreldrekatalogen"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Sk"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Skil store/sm]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Reguttrykk]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Sket gjekk rundt"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Dette er einaste forekomst"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr "Ingen fleire opne filer"
 msgid "Switched to %s"
 msgstr "Bytta til %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Ny buffer"
 
@@ -146,13 +146,13 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "%s ikkje funne"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, 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:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila %s er ikkje ei vanleg fil"
@@ -209,7 +209,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
@@ -219,67 +219,67 @@ msgstr ""
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skreiv %d linjer"
 msgstr[1] "Skreiv %d linjer"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Bakover]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Legg til valt omrde p slutten av fil"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Legg til valt omrde p slutten av fil"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Lagra valt omrde til fil"
 
-#: src/files.c:1881
+#: src/files.c:1884
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Namn p fil som skal leggjast til"
 
-#: src/files.c:1882
+#: src/files.c:1885
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Namn p fil som skal leggjast til"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Namn p fila som skal lagrast"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Fila eksisterer, SKRIV OVER?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(meir)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -438,33 +438,33 @@ msgstr "Neste fil"
 msgid "Go To Line"
 msgstr "G til linje"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Brekk om avsnittet"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Brekk om avsnittet"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"
@@ -744,229 +744,229 @@ msgid "Go to directory"
 msgstr "G til katalog"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Lagra"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Brekk om"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Les fil"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Klipp"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "U-ombrekk"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "U-klipp"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Posisjon"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Staving"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klipp"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "U-klipp"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Framover"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Frre side"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Neste fil"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "End"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Finn den andre klamma"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Frre fil"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Neste fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast markrposisjon"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jamn linjerulling"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Mange filbuffer"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Musesttte"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Inga omsetjing fr DOS/Mac-format"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -994,7 +994,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i skjemodus:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1003,7 +1003,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1024,7 +1024,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i G til linje-modus:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1052,7 +1052,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i Set inn fil-modus:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1061,7 +1061,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i Lagre fil-modus:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i filutforskaren:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1143,13 +1143,13 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i skjemodus:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1172,7 +1172,7 @@ msgstr ""
 " Flgjande funksjonstastar er tilgjengelege i G til katalog-modus:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1195,7 +1195,7 @@ msgstr ""
 " Flgjande andre funksjonar er tilgjengelege i stavesjekkingsmodus:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1207,7 +1207,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1234,7 +1234,7 @@ msgstr ""
 "tastaturoppsettet ditt. Dei flgjande tastetrykkja er tilgjengelege i "
 "hovudvindauget. Valfrie tastar er vist i parentes:\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1245,7 +1245,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1254,7 +1254,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 #, fuzzy
 msgid "enable/disable"
 msgstr "%s skru p/av"
@@ -1650,7 +1650,7 @@ msgstr ""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk m starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna %s: %s"
@@ -1860,9 +1860,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Avbryt gjeldande funksjon"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1896,7 +1896,7 @@ msgid "text replace"
 msgstr " ( erstatta)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1909,7 +1909,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1932,7 +1932,7 @@ msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2002,7 +2002,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Legg til valt omrde p slutten av fil"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "nano: malloc: tom for minne!"
@@ -2013,60 +2013,60 @@ msgstr "nano: malloc: tom for minne!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Endra"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %d/%d (%.0f%%), kol %ld/%ld (%.0f%%), teikn %ld/%ld (%.0f%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi glymde..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
diff --git a/po/pl.po b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.99pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2003-02-05 10:10+0200\n"
 "Last-Translator: Wojciech Kotwica <wkotwica@post.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Przejd do katalogu"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Anulowano"
@@ -35,8 +35,8 @@ msgstr "W trybie ograniczonym nie mo
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Nieprawidowy znacznik cytowania %s: %s"
@@ -47,48 +47,48 @@ msgstr "Nie mo
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Szukaj"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Uwzgl.wielk.liter]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Wyr.reg.]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Wstecz]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Wyszukiwanie mino granic pliku - kontynuowane od pocztku (koca)"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "To jedyne wystpienie"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr "Nie ma wi
 msgid "Switched to %s"
 msgstr "Przeczono na %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
@@ -152,12 +152,12 @@ msgstr "Nowy plik"
 msgid "\"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Plik \"%s\" jest plikiem urzdzenia"
@@ -214,7 +214,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Nieprawidowy znacznik cytowania %s: %s"
@@ -224,7 +224,7 @@ msgstr "Nieprawid
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -232,56 +232,56 @@ msgstr[0] "Zapisano %d lini
 msgstr[1] "Zapisano %d linie"
 msgstr[2] "Zapisano %d linii"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [format DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [format Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Kopia zap.]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Wpisz wybr na pocztek pliku"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Dopisz wybr do pliku"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Zapisz wybr do pliku"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nazwa pliku do wpisania"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nazwa pliku do dopisania"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nazwa pliku do zapisu"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Plik istnieje, ZAMAZA?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(wicej)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -439,33 +439,33 @@ msgstr "Nast
 msgid "Go To Line"
 msgstr "Przejd do linii"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Wyjustuj biecy akapit"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Anuluj biec funkcj"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zamknij biecy plik / Wyjd z nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Wyjd z nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Zapisz biecy plik na dysku"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Wyjustuj biecy akapit"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Wstaw do biecego pliku zawarto innego pliku"
@@ -745,230 +745,230 @@ msgid "Go to directory"
 msgstr "Przejd do katalogu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Zapisz"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Wyjustuj"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Wczytaj plik"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Wytnij"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Cofnij just."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Wklej"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Bie.poz."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Pisownia"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Wytnij"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Wytnij"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Wklej"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "W przd"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Nast.sowo"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Poprz.sowo"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Poprz.str."
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Nastpny plik"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Pocztek"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Znajd nawias do pary"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Poprzedni plik"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Nastpny plik"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Usu"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Stae pooenie kursora"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Pynne przewijanie"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Kolorowanie skadni"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Auto wcicia"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Wytnij do koca"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Kopia zapas."
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Wiele buforw plikowych"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Obsuga myszy"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Zawie"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -994,7 +994,7 @@ msgstr ""
 " W trybie szukania dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1003,7 +1003,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1023,7 +1023,7 @@ msgstr ""
 "funkcyjne:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1052,7 +1052,7 @@ msgstr ""
 " W trybie wstawiania pliku dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1061,7 +1061,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 " W trybie zapisu pliku dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 " W przegldarce plikw dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1141,13 +1141,13 @@ msgstr ""
 " W trybie szukania dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1172,7 +1172,7 @@ msgstr ""
 "klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1197,7 +1197,7 @@ msgstr ""
 " W trybie sprawdzania pisowni dostpne s nastpujce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1218,7 +1218,7 @@ msgstr ""
 " W tym trybie dostpne s nastpujce klawisze:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1248,7 +1248,7 @@ msgstr ""
 "ujto w nawiasy:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1259,7 +1259,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1268,7 +1268,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 #, fuzzy
 msgid "enable/disable"
 msgstr "%.*s wcz/wycz\n"
@@ -1672,7 +1672,7 @@ msgstr "argument %s ma niedomkni
 msgid "Regex strings must begin and end with a \" character"
 msgstr "wyraenia regularne musz zaczyna si i koczy znakiem \"\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Bdne wyraenie regularne \"%s\": %s"
@@ -1880,9 +1880,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Anuluj biec funkcj"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1916,7 +1916,7 @@ msgid "text replace"
 msgstr " (i zastp)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1929,7 +1929,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1950,7 +1950,7 @@ msgid "Could not fork"
 msgstr "Nie mona rozwidli procesu"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2019,7 +2019,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Dopisz wybr do pliku"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano brako pamici!"
 
@@ -2029,61 +2029,61 @@ msgstr "nano brak
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " Zmieniony "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " Przegl. "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Plik: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin.%ld/%ld (%d%%), kol.%lu/%lu (%d%%), zn.%lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "wersja "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Specjalne podzikowania otrzymuj:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "oraz wszyscy pozostali, o ktrych zapomnielimy..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Dzikujemy za prac z nano!\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2006-09-27 02:13-0300\n"
 "Last-Translator: J. Victor D. Martins <jvdm@sdf.lonestar.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Ir para o Diretrio"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Cancelado"
@@ -32,8 +32,8 @@ msgstr "Imposs
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro na leitura %s: %s"
@@ -44,48 +44,48 @@ msgstr "Imposs
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(dir acima)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Busca"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr "[Sensibilidade de Caixa]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr "[Expresso Regular]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr "[Retroceder]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Busca Ajustada"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Est  nica ocorrncia"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Nenhum padro de busca atualmente"
 
@@ -103,7 +103,7 @@ msgstr "Sem mais bufferes de arquivos abertos"
 msgid "Switched to %s"
 msgstr "Alternado para %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Novo Buffer"
 
@@ -144,12 +144,12 @@ msgstr "Novo Arquivo"
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\"  um diretrio"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\"  um arquivo dispositivo"
@@ -202,7 +202,7 @@ msgstr "Muitos arquivos de seguran
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
@@ -212,62 +212,62 @@ msgstr "Erro ao escrever %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporrio: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escrito %lu linha"
 msgstr[1] "Escrito %lu linhas"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Becape]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Pre-Adicionar seleo para o Arquivo"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Adicionar seleo para o Arquivo"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Escrever a Seleo para o Arquivo"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nome Arquivo para Pr-Adicionar"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Arquivo para Adicionar ao"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nome do Arquivo para Gravar"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Arquivo j existe, SOBRESCREVER ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvar o Arquivo com um NOME DIFERENTE ?"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(mais)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -417,32 +417,32 @@ msgstr "Inserir Arquivo"
 msgid "Go To Line"
 msgstr "Ir Para a Linha"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justificar o pargrafo atual"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Cancelar a funo atual"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Abrir texto de ajuda"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fechar o arquivo carregado atual/Sair do nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Sair do nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Escrever o arquivo atual no disco"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justificar o pargrafo atual"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Inserir outro arquivo no atual"
@@ -706,221 +706,221 @@ msgid "Go to directory"
 msgstr "Ir para o diretrio"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Gravar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justificar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Ler o Arquivo"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Recortar Texto"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "DesJustificar"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Colar Txt"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Pos Atual"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Para Spell"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marcar Texto"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Alinhar Texto"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Desalinhas Txt"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Avanar"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Retornar"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Prx Palavra"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Palavra Anterior"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Linha Ant"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Prox Linha"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Encontrar Outro Parenteses"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Prximo Arquivo"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Arquivo Anterior"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Entrada Literal"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabulao"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Entra"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "RecortarAtOFim"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo Ajuda"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Mostra da posio do cursor constante"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uso de mais de uma linha para edio"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Rolagem Macia"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Mostrar espaos-vazios"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Marcao Colorida de Sintaxe"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tecla HOME inteligente"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Indentao Automtica"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Recortar at o fim"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Ajuste de linhas longas"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Converso de tabulaes para espaos"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Bacape dos Arquivos"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Mltiplos bufferes de arquivos"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Suporte ao Rato"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Sem converses do formato DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Suspeno"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -943,7 +943,7 @@ msgstr ""
 "busca. Pressionando Enter sem inserir nenhum texto ir fazer a busca "
 "anterior.   "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -957,7 +957,7 @@ msgstr ""
 "As seguintes teclas de funo vo estar disponveis no modo de Busca:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -977,7 +977,7 @@ msgstr ""
 " As seguintes teclas de funes esto disponveis no modo Ir Para Linha:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1000,7 +1000,7 @@ msgstr ""
 "carregado em um outro buffer separado (utilize Meta-< e > para alternar "
 "entre os bufferes).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1017,7 +1017,7 @@ msgstr ""
 
 # Talvez a traduo de 'prompted' no est correta.
 # Foi notificado na lista da ldp-br.
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 "Arquivo:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1072,7 +1072,7 @@ msgstr ""
 "\n"
 " As seguintes teclas de funes esto disponveis no Navegador de Arquivos:\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1097,7 +1097,7 @@ msgstr ""
 "com esta string anterior.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1105,7 +1105,7 @@ msgstr ""
 " As seguintes teclas de funo esto disponveis no modo de Navegao de "
 "Busca:\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1129,7 +1129,7 @@ msgstr ""
 "Navegador de Ida  Diretrios:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1154,7 +1154,7 @@ msgstr ""
 "Ortografia:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 " As seguintes teclas de funes esto disponveis neste modo:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1197,7 +1197,7 @@ msgstr ""
 "principal de edio exibindo o arquivo que est sendo editado.  A linha de "
 "estado  a terceira, mostrando mensagens importantes.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1216,7 +1216,7 @@ msgstr ""
 "executadas com as teclas Esc, Alt ou Meta, dependendo da sua configurao de "
 "teclado.   "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1230,7 +1230,7 @@ msgstr ""
 "Teclas alternativas so mostradas em parenteses:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "habilitado/desabilitado"
 
@@ -1610,7 +1610,7 @@ msgstr "Argumento '%s' possui inderterminado \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expresso regular deve comear e terminar com um caractere \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresso regular errnea \"%s\": %s"
@@ -1815,9 +1815,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Alinhar a linha atual"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1851,7 +1851,7 @@ msgid "text replace"
 msgstr " (para substituir) na seleo"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1864,7 +1864,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1885,7 +1885,7 @@ msgid "Could not fork"
 msgstr "Impossvel bifurcar"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1953,7 +1953,7 @@ msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 msgid "In Selection:  "
 msgstr "Na seleo:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano est sem memria!"
 
@@ -1963,56 +1963,56 @@ msgstr "nano est
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Olhar"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin %ld/%ld (%d%%), col %lu/%lu (%d%%), carac %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "verso"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Trazido para voc por:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "A Fundao Software Livre"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que ns esquecemos..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Obrigado por utilizar o nano!"
 
diff --git a/po/ro.po b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2005-04-18 07:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Mergi la Director"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Am renunat"
@@ -33,8 +33,8 @@ msgstr "Nu pot merge 
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eroare citind %s: %s"
@@ -45,48 +45,48 @@ msgstr "Nu pot schimba 
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Caut"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Case Sensitive]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Regexp]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [napoi]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Cutare de la nceput"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Aceasta este singura apariie"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Nici un pattern de cutare curent"
 
@@ -104,7 +104,7 @@ msgstr "Nici un alt bufere deschis"
 msgid "Switched to %s"
 msgstr "Am schimbat la %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Bufer nou"
 
@@ -145,12 +145,12 @@ msgstr "Fi
 msgid "\"%s\" not found"
 msgstr "\"%s\" nu a fost gsit"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" este un director"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fiierul \"%s\" este un fiier dispozitiv (device)"
@@ -205,7 +205,7 @@ msgstr "Fi
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eroare scriind %s: %s"
@@ -215,62 +215,62 @@ msgstr "Eroare scriind %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Eroare la scrierea fiierului temporar: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Am scris %u linie"
 msgstr[1] "Am scris %u linii"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Copie de siguran (backup)]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Pre-adaug Selecie la fiier"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Adaug Selecie la fiier"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Scrie Selecie n fiier"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Nume de pre-adugat la"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Nume de adugat la"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Nume de scris"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Fiierul exist, SUPRASCRIE ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salveaz fiierul sun UN NUME DIFERIT ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(suplimentar)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -425,33 +425,33 @@ msgstr "Insereaz
 msgid "Go To Line"
 msgstr "Du-te la linia"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Aliniaz paragraful curent"
+
 #. 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:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Anuleaz funcia curent"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "nchide fiierul ncrcat curent/Iei din nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Ieire din nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Scrie fiierul curent pe disc"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Aliniaz paragraful curent"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Insereaz alt fiier n fiierul curent"
@@ -730,229 +730,229 @@ msgid "Go to directory"
 msgstr "Du-te la director"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "nchide"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Scrie ieire"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Aliniaz"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Citete fiier"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Taie text"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "De-aliniaz"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Anuleaz tiere text"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Poz. Crt."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "De ortografiat"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Marcheaz text"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Taie text"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Taie text"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Anuleaz tiere text"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "nainte"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "napoi"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Cuvnt urmtor"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Cuvnt precedent"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Linia precedent"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Linia urmtoare"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Acas"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Sfrit"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Gsete cealalt parantez"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Fiier precedent"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Fiier urmtor"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Intrare identic"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "terge"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "terge napoi (backspace)"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "TaiePnLaSfrit"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mod Ajutor"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Poziie cursor neschimbat"
 
-#: src/global.c:1223
+#: src/global.c:1219
 #, fuzzy
 msgid "Use of one more line for editing"
 msgstr "Folosete mai mult spaiu pentru editare"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Rulare (scrolling) fin"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Afieaz spaiu-alb"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Evideniere sintax color"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Tast acas inteligent"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Auto paragraf"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Taie pn la sfrit"
 
-#: src/global.c:1237
+#: src/global.c:1233
 #, fuzzy
 msgid "Long line wrapping"
 msgstr "Trecere automat (wrap) la linie nou"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Fiiere copie de siguran (backup)"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Multiple bufere fiiere"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Suport maus"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Nici o conversie de format DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Suspend"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -974,7 +974,7 @@ msgstr ""
 " irul cutat anterior va fi artat n paranteze dup prompt-ul de cutare. "
 "Apsnd Enter fr a introduce vreun text va executa cutarea anterioar.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -987,7 +987,7 @@ msgstr ""
 "\n"
 "Urmtoarele taste de funcii sunt disponibile n modul \"Caut\":\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1006,7 +1006,7 @@ msgstr ""
 "\n"
 " Urmtoarele taste de funcii sunt disponibile n modul \"Du-te la linia\":\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 "acesta s fie ncrcat ntr-un alt bufer (folosii Meta-< i > pentru a "
 "comuta ntre bufere). "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1043,7 +1043,7 @@ msgstr ""
 " Urmtoarele taste de funcii sunt disponibile n modul \"Insereaz fiier"
 "\":\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1071,7 +1071,7 @@ msgstr ""
 " Urmtoarele taste de funcii sunt disponibile n modul \"Scrie fiier\"\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1096,7 +1096,7 @@ msgstr ""
 " Urmtoarele taste de funcii sunt disponibile n \"Navigator fiiere\":\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1120,13 +1120,13 @@ msgstr ""
 " irul cutat anterior va fi artat n paranteze dup prompt-ul de cutare. "
 "Apsnd Enter fr a introduce vreun text va executa cutarea anterioar.  "
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 "Directorul\":\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1175,7 +1175,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1196,7 +1196,7 @@ msgstr ""
 " Urmtoarele taste sunt disponibile n acest mod:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1221,7 +1221,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:372
+#: src/help.c:366
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 "simbolul Meta (M) i pot fi introduse folosind oricare din tastele Esc, Alt "
 "sau Meta, n funcie de setarea tastaturii d-voastr.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1253,7 +1253,7 @@ msgstr ""
 "paranteze:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "activeaz/deactiveaz"
 
@@ -1660,7 +1660,7 @@ msgstr "Argumentul %s are \" neterminat"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "irurile regex trebuie s nceap i sfreasc cu un caracter \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex incorect \"%s\": %s"
@@ -1868,9 +1868,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Taie de la cursor la sfritul liniei"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1904,7 +1904,7 @@ msgid "text replace"
 msgstr " (de nlocuit)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1917,7 +1917,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1938,7 +1938,7 @@ msgid "Could not fork"
 msgstr "Nu am putut fork"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2007,7 +2007,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Adaug Selecie la fiier"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano a epuizat memoria!"
 
@@ -2018,58 +2018,58 @@ msgid "Unicode Input"
 msgstr ""
 
 #
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Modificat"
 
 #
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Vedere"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fiier:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, 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%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Adus pentru d-voastr de:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Mulumiri speciale lui:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "i oricine altcineva a fost uitat..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "V mulumim c folosii nano!"
 
diff --git a/po/ru.po b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano-2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-04-16 15:39+0200\n"
 "Last-Translator: Sergey Ribalchenko <serge.fisher@gmail.com>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr " "
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr ""
@@ -36,8 +36,8 @@ msgstr "
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "  %s: %s"
@@ -48,48 +48,48 @@ msgstr "
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "()"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(. )"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [ ]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " []"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " []"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr " "
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "  "
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr " "
 
@@ -107,7 +107,7 @@ msgstr "
 msgid "Switched to %s"
 msgstr "  %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr " "
 
@@ -152,12 +152,12 @@ msgstr "
 msgid "\"%s\" not found"
 msgstr "\"%s\"  "
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr " \"%s\" -  "
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr " \"%s\"   "
@@ -210,7 +210,7 @@ msgstr "
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "  %s: %s"
@@ -220,7 +220,7 @@ msgstr "
 msgid "Error writing temp file: %s"
 msgstr "   : %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -228,55 +228,55 @@ msgstr[0] "
 msgstr[1] " %lu "
 msgstr[2] " %lu "
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [ DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [ Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " []"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "    (  )"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "    (  )"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "   "
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "    ( )"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "    ( )"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "   "
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr " ,  ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "     ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "()"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -425,32 +425,32 @@ msgstr "
 msgid "Go To Line"
 msgstr " "
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "  "
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "  "
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "   "
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "   /   nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "  nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "    "
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "  "
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "    "
@@ -696,221 +696,221 @@ msgid "Go to directory"
 msgstr "  "
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr ""
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr ""
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr " "
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr " "
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr " "
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr " "
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr ""
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr ""
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "  "
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr " "
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr " "
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr " "
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr " "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr " \" \""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr " "
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr " "
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr " "
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "   "
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "    "
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr " "
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr " "
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr " "
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "  Home"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr " "
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "  "
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "  "
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "   "
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr " "
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "  "
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr " "
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "   DOS/Mac "
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr ""
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -932,7 +932,7 @@ msgstr ""
 "':'.        "
 ".  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -946,7 +946,7 @@ msgstr ""
 "       :\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -966,7 +966,7 @@ msgstr ""
 "         :\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -989,7 +989,7 @@ msgstr ""
 "    ( Meta-< and >    "
 " ).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1003,7 +1003,7 @@ msgstr ""
 "        :\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 "       :\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1055,7 +1055,7 @@ msgstr ""
 "       :\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1081,7 +1081,7 @@ msgstr ""
 "       :\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1090,7 +1090,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1113,7 +1113,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1137,7 +1137,7 @@ msgstr ""
 "        :\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1158,7 +1158,7 @@ msgstr ""
 "        :\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1178,7 +1178,7 @@ msgstr ""
 "   ,     . "
 "  - 3   -    .  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1196,7 +1196,7 @@ msgstr ""
 "       Esc, Alt  Meta,    "
 " .  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1210,7 +1210,7 @@ msgstr ""
 ":\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "/"
 
@@ -1588,7 +1588,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "        \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "   \"%s\": %s"
@@ -1793,9 +1793,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "  "
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1829,7 +1829,7 @@ msgid "text replace"
 msgstr " ( )"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1842,7 +1842,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1863,7 +1863,7 @@ msgid "Could not fork"
 msgstr "   fork()"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1931,7 +1931,7 @@ msgstr "%s
 msgid "In Selection:  "
 msgstr " :  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "   nano!"
 
@@ -1941,58 +1941,58 @@ msgstr "
 msgid "Unicode Input"
 msgstr " "
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr ":"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr ":"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr " %ld/%ld (%d%%),  %lu/%lu (%d%%),  %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "  nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr " :"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr " :"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (   )"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr " ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr ""
 "        ,    "
 "..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "    nano!"
diff --git a/po/rw.po b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2005-04-03 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Kureka"
@@ -41,8 +41,8 @@ msgstr "Gyayo Hanze Bya in Nta gukoresha bisesuye Ubwoko"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
@@ -54,13 +54,13 @@ msgstr "Kwimura Hejuru a bushyinguro"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
@@ -68,39 +68,39 @@ msgstr ""
 # offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_SEARCH.text
 # #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG.3.text
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Gushaka"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr ""
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr ""
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 #, fuzzy
 msgid "This is the only occurrence"
 msgstr "ni i ukugaragara"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 #, fuzzy
 msgid "No current search pattern"
 msgstr "KIGEZWEHO Gushaka Ishusho"
@@ -120,7 +120,7 @@ msgstr "Birenzeho Gufungura IDOSIYE"
 msgid "Switched to %s"
 msgstr "Kuri"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr ""
 
@@ -162,12 +162,12 @@ msgstr "Idosiye"
 msgid "\"%s\" not found"
 msgstr "\"%s\"ntibyabonetse"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\"ni a bushyinguro"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Idosiye ni a APAREYE IDOSIYE"
@@ -224,7 +224,7 @@ msgstr "Idosiye"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
@@ -234,70 +234,70 @@ msgstr ""
 msgid "Error writing temp file: %s"
 msgstr "IDOSIYE"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Umurongo"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr ""
 
-#: src/files.c:1876
+#: src/files.c:1879
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Kuri Idosiye"
 
-#: src/files.c:1877
+#: src/files.c:1880
 #, fuzzy
 msgid "Append Selection to File"
 msgstr "Kuri Idosiye"
 
-#: src/files.c:1878
+#: src/files.c:1881
 #, fuzzy
 msgid "Write Selection to File"
 msgstr "Kuri Idosiye"
 
-#: src/files.c:1881
+#: src/files.c:1884
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Idosiye Kuri Kuri"
 
-#: src/files.c:1882
+#: src/files.c:1885
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Idosiye Kuri Kuri"
 
-#: src/files.c:1883
+#: src/files.c:1886
 #, fuzzy
 msgid "File Name to Write"
 msgstr "Idosiye Kuri"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Idosiye"
 
-#: src/files.c:2021
+#: src/files.c:2026
 #, fuzzy
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Kubika IDOSIYE"
 
-#: src/files.c:2458
+#: src/files.c:2463
 #, fuzzy
 msgid "(more)"
 msgstr "(Birenzeho"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -497,37 +497,37 @@ msgstr "Kongeramo Idosiye"
 msgid "Go To Line"
 msgstr "Gya kumurongo"
 
+#: src/global.c:487
+#, fuzzy
+msgid "Justify the current paragraph"
+msgstr "i KIGEZWEHO Igika"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 #, fuzzy
 msgid "Cancel the current function"
 msgstr "i KIGEZWEHO Umumaro"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Funga IDOSIYE Bivuye"
 
-#: src/global.c:495
+#: src/global.c:498
 #, fuzzy
 msgid "Exit from nano"
 msgstr "Bivuye"
 
-#: src/global.c:499
+#: src/global.c:502
 #, fuzzy
 msgid "Write the current file to disk"
 msgstr "i KIGEZWEHO IDOSIYE Kuri"
 
-#: src/global.c:501
-#, fuzzy
-msgid "Justify the current paragraph"
-msgstr "i KIGEZWEHO Igika"
-
 #: src/global.c:504
 #, fuzzy
 msgid "Insert another file into the current one"
@@ -832,78 +832,78 @@ msgstr "Kuri bushyinguro"
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Gufunga"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr ""
 
 # sc/source\ui\src\scstring.src:SCSTR_HOR_JUSTIFY_BLOCK.text
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Gukwiza umurongo wose"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 #, fuzzy
 msgid "Read File"
 msgstr "Idosiye"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
 # sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Imbere"
 
@@ -935,65 +935,65 @@ msgstr "Imbere"
 # sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_LOSS.1.text
 # #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
 # sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_PLUS.1.text
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Inyuma"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr ""
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Home"
 
 # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Impera"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr ""
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 #, fuzzy
 msgid "Previous File"
 msgstr "Idosiye"
 
-#: src/global.c:839
+#: src/global.c:837
 #, fuzzy
 msgid "Next File"
 msgstr "Idosiye"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
 # sc/source\ui\src\textdlgs.src:RID_SCDLG_PARAGRAPH.1.RID_SVXPAGE_TABULATOR.text
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Isimbuka"
 
@@ -1005,7 +1005,7 @@ msgstr "Isimbuka"
 # then translate them or insert the appropriate glyph
 # otherwise you should probably just translate the glyph regions
 # LOCALIZATION NOTE : BLOCK maybe GLYPHS
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Injiza"
 
@@ -1013,7 +1013,7 @@ msgstr "Injiza"
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Gusiba"
 
@@ -1021,96 +1021,96 @@ msgstr "Gusiba"
 # sw/sdi\swslots.src:FN_BACKSPACE.text
 # #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
 # sw/sdi\swslots.src:FN_SHIFT_BACKSPACE.text
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Gusiba usubira inyuma"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 #, fuzzy
 msgid "Help mode"
 msgstr "Ubwoko"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "indanga Ibirindiro"
 
-#: src/global.c:1223
+#: src/global.c:1219
 #, fuzzy
 msgid "Use of one more line for editing"
 msgstr "Bya Birenzeho Umwanya kugirango"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1227
+#: src/global.c:1223
 #, fuzzy
 msgid "Whitespace display"
 msgstr "Kugaragaza"
 
-#: src/global.c:1229
+#: src/global.c:1225
 #, fuzzy
 msgid "Color syntax highlighting"
 msgstr "Igaragaza cyane"
 
-#: src/global.c:1231
+#: src/global.c:1227
 #, fuzzy
 msgid "Smart home key"
 msgstr "Ku Ntangiriro Urufunguzo"
 
-#: src/global.c:1233
+#: src/global.c:1229
 #, fuzzy
 msgid "Auto indent"
 msgstr "Ikurura"
 
-#: src/global.c:1235
+#: src/global.c:1231
 #, fuzzy
 msgid "Cut to end"
 msgstr "Kuri Impera"
 
-#: src/global.c:1237
+#: src/global.c:1233
 #, fuzzy
 msgid "Long line wrapping"
 msgstr "Umurongo Gufunika"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Idosiye"
 
-#: src/global.c:1243
+#: src/global.c:1239
 #, fuzzy
 msgid "Multiple file buffers"
 msgstr "IDOSIYE"
 
-#: src/global.c:1245
+#: src/global.c:1241
 #, fuzzy
 msgid "Mouse support"
 msgstr "Gushigikira"
 
-#: src/global.c:1247
+#: src/global.c:1243
 #, fuzzy
 msgid "No conversion from DOS/Mac format"
 msgstr "Ihindurangero Bivuye Imiterere"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr ""
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1130,7 +1130,7 @@ msgstr ""
 "Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
 "Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1139,7 +1139,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "Umubare Kuri i Iheruka Umurongo Bya i IDOSIYE Umumaro Utubuto Bihari in "
 "Ubwoko"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1176,7 +1176,7 @@ msgstr ""
 "ry'idosiye: ku i Urwinjiriro Na Kanda Umumaro Utubuto Bihari in Idosiye "
 "Ubwoko"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1185,7 +1185,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "a IDOSIYE i Bya i KIGEZWEHO IDOSIYE Na: a Bya i KIGEZWEHO Izina ry'idosiye: "
 "ni OYA i Mburabuzi in iyi Ubwoko Umumaro Utubuto Bihari in Idosiye Ubwoko"
 
-#: src/help.c:295
+#: src/help.c:289
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1229,7 +1229,7 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1250,13 +1250,13 @@ msgstr ""
 "Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
 "Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1273,7 +1273,7 @@ msgstr ""
 "Yahagaritswe Gukoresha i Urufunguzo Kuri Kuri ku buryo bwikora Byuzuye i "
 "bushyinguro Izina: Umumaro Utubuto Bihari in Ubwoko"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1292,7 +1292,7 @@ msgstr ""
 "Bya i ijambo in i KIGEZWEHO IDOSIYE Cyangwa NIBA Byahiswemo Umwandiko Na: i "
 "Ikimenyetso in i Byahiswemo Umwandiko Ikindi Imimaro Bihari in Ubwoko"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1308,7 +1308,7 @@ msgstr ""
 "Igikonoshwa i KIGEZWEHO Cyangwa a Gishya in Ubwoko Ahatanditseho OYA Injiza "
 "Komandi: Utubuto Bihari in iyi Ubwoko"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1320,7 +1320,7 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1331,7 +1331,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1340,7 +1340,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 #, fuzzy
 msgid "enable/disable"
 msgstr "Gushoboza"
@@ -1775,7 +1775,7 @@ msgstr ""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Ikurikiranyanyuguti Na Impera Na: a Inyuguti"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
@@ -1997,9 +1997,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Bivuye indanga Kuri Impera Bya Umurongo"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -2033,7 +2033,7 @@ msgid "text replace"
 msgstr "(Kuri Gusimbura"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -2046,7 +2046,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -2069,7 +2069,7 @@ msgid "Could not fork"
 msgstr "OYA"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2146,7 +2146,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Kuri Idosiye"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "ni Inyuma Bya Ububiko"
@@ -2158,7 +2158,7 @@ msgid "Unicode Input"
 msgstr ""
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_DOC_MODIFIED.text
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Byahinduwe"
 
@@ -2174,59 +2174,59 @@ msgstr "Byahinduwe"
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.3.text
 # #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
 # offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.3.text
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Igaragaza"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr ""
 
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_LINKERRORFILE.text
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Idosiye:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Umurongo Col INYUGUTI"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 #, fuzzy
 msgid "The nano text editor"
 msgstr "Umwandiko Muhinduzi"
 
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "Verisiyo"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 #, fuzzy
 msgid "Brought to you by:"
 msgstr "Kuri ku"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 #, fuzzy
 msgid "Special thanks to:"
 msgstr "Kuri"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 #, fuzzy
 msgid "and anyone else we forgot..."
 msgstr "Na Ikindi Twebwe"
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "kugirango ikoresha"
diff --git a/po/sr.po b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2003-11-05 22:27+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Отказано"
@@ -33,8 +33,8 @@ msgstr "Не могох да одем ван %s у ограниченом реж
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Лоша ниска за цитирање %s: %s"
@@ -45,48 +45,48 @@ msgstr "Не могох да уђем у наддиректоријум"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Тражи"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr "[разл. слова по величини]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr "[рег. израз]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr "[уназад]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Претрага у круг"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Ово је једина појава"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr "Нема више отворених датотека"
 msgid "Switched to %s"
 msgstr "Пребацих се на %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Нови бафер"
 
@@ -150,12 +150,12 @@ msgstr "Нова датотека"
 msgid "\"%s\" not found"
 msgstr "Не нађох „%s“"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Датотека „%s“ чини датотеку уређаја"
@@ -212,7 +212,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Лоша ниска за цитирање %s: %s"
@@ -222,7 +222,7 @@ msgstr "Лоша ниска за цитирање %s: %s"
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -230,56 +230,56 @@ msgstr[0] "Уписах %d ред"
 msgstr[1] "Уписах %d реда"
 msgstr[2] "Уписах %d редова"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr "[ДОС запис]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr "[Мек запис]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr "[Резерва]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Додај избор на почетак датотеке"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Додај избор на крај датотеке"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Упиши избор у датотеку"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "У коју датотеку додати"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "У коју датотеку додати"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "У коју датотеку уписати"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Датотека постоји, да ПРЕСНИМИМ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(више)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -437,33 +437,33 @@ msgstr "Следећа датотека"
 msgid "Go To Line"
 msgstr "Иди у ред"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Поравнај текући пасус"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Откажи текућу операцију"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затвори тренутно учитану датотеку/изађи из нана"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Изађи из нана"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Упиши текућу датотеку на диск"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Поравнај текући пасус"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Уметни другу датотеку у текућу"
@@ -743,231 +743,231 @@ msgid "Go to directory"
 msgstr "Иди у директоријум"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Затвори"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Испиши"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Пораванај"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Прочитај датотеку"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Исеци текст"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Одравнај"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Убаци текст"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Пол. курз."
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "У проверу правописа"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Означи текст"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Исеци текст"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Исеци текст"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Убаци текст"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Напред"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Назад"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Следећа реч"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Претходна страна"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Следећа датотека"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Нађи другу заграду"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Претходна датотека"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Следећа датотека"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Унос"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Брисање"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Константан положај курзора"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Глатко клизање"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Истицање синтаксе у боји"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Исеци до краја"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Сачини резерву датотеке"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Бафери више датотека"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Без претварања из Мекинтош/ДОС записа"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Суспендуј"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -993,7 +993,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму претраге:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1002,7 +1002,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1022,7 +1022,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму одласка у ред:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1051,7 +1051,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму уметања датотеке:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1060,7 +1060,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1089,7 +1089,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму уписа датотеке:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 "\n"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1141,13 +1141,13 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму претраге:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1170,7 +1170,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму одласка у директоријум:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1194,7 +1194,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у режиму провере правописа:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1214,7 +1214,7 @@ msgstr ""
 " Наредни тастери обављају неки посао у овом режиму:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1244,7 +1244,7 @@ msgstr ""
 "приказани у заградама:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1255,7 +1255,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1264,7 +1264,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "укључи/искључи"
 
@@ -1668,7 +1668,7 @@ msgstr "аргумент %s садржи недовршен \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "ниске регуларних израза морају почети и завршити се знаком \"\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
@@ -1877,9 +1877,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Откажи текућу операцију"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1913,7 +1913,7 @@ msgid "text replace"
 msgstr " (за замену)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1926,7 +1926,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1947,7 +1947,7 @@ msgid "Could not fork"
 msgstr "Не могу да покренем"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2016,7 +2016,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Додај избор на крај датотеке"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "нану је понестало меморије!"
 
@@ -2026,61 +2026,61 @@ msgstr "нану је понестало меморије!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " Измењено "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " Преглед "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr "ДИР: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Датотека:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), стубац %lu/%lu (%d%%), знак %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Уређивач текста нано"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "издање "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Омогућили су вам:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Посебну захвалност дугујемо:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Задужбина за Слободни Софтвер"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "За ен-курсис:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "и сви остали које смо пропустили..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Хвала што користите нана!\n"
diff --git a/po/sv.po b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2006-08-24 20:53+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "G till katalog"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Avbruten"
@@ -32,8 +32,8 @@ msgstr "Kan inte g
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fel vid inlsning av %s: %s"
@@ -44,48 +44,48 @@ msgstr "Kan inte g
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(frldkat)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Sk"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Skiftlgesknslig]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Reguljrt uttryck]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Baklnges]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Skningen brjade om frn brjan"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Detta r enda frekomsten"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Inget aktuellt skmnster"
 
@@ -103,7 +103,7 @@ msgstr "Inga fler 
 msgid "Switched to %s"
 msgstr "Vxlade till %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Ny buffert"
 
@@ -144,12 +144,12 @@ msgstr "Ny fil"
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" r en katalog"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" r en enhetsfil"
@@ -204,7 +204,7 @@ msgstr "F
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
@@ -214,62 +214,62 @@ msgstr "Fel vid skrivning av %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Fel vid skrivning av temporr fil: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu rad"
 msgstr[1] "Skrev %lu rader"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Skerhetskopia]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Infoga markering till fil"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Lgg till markering till fil"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Skriv markering till fil"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Filnamn att infoga i"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Filnamn att lgga till i"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Filnamn att skriva"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Filen existerar, SKRIVA VER? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -420,32 +420,32 @@ msgstr "Infoga fil"
 msgid "Go To Line"
 msgstr "G till rad"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Justera det aktuella stycket"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Visa denna hjlptext"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Stng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Avsluta nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Justera det aktuella stycket"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"
@@ -707,221 +707,221 @@ msgid "Go to directory"
 msgstr "G till katalog"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Stng"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Spara"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Justera"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Ls fil"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Klipp ut"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Ojustera"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "ngra kopi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Stavkontr."
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Dra in text"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "ngra indragning av text"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Framt"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Bakt"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Nsta ord"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Freg ord"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Freg rad"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Nsta rad"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Hitta andra klammern"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Fregende fil"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Nsta fil"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Ordagrann inmatning"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Backsteg"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjlplge"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Konstant visning av markrposition"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Anvndning av ytterligare en rad fr redigering"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Mjuk rullning"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Visning av mellanrum"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Frgmarkering av syntax"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Radbryt lnga rader"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Skerhetskopiera filer"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Flera filbuffertar"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Musstd"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering frn DOS/Mac-format"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Suspendering"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -943,7 +943,7 @@ msgstr ""
 "Att trycka Retur utan att ange ngon text kommer att genomfra den tidigare "
 "skningen.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -957,7 +957,7 @@ msgstr ""
 " Fljande funktionstangenter finns tillgngliga i sklget:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -977,7 +977,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i G till rad-lge:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1000,7 +1000,7 @@ msgstr ""
 "att den lses in i en separat buffert (anvnd Meta-< och > fr att vxla "
 "mellan filbuffertar). "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1014,7 +1014,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i infoga fil-lge:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1042,7 +1042,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i filskrivningslge:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1066,7 +1066,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i filblddraren:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1090,7 +1090,7 @@ msgstr ""
 "skningen.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1098,7 +1098,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i sklget:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "lge:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 " Fljande funktionstangenter r tillgngliga i stavningskontrollget:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 " Fljande tangenter r tillgngliga i det externa kommandolget:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1187,7 +1187,7 @@ msgstr ""
 "visar filen som redigeras. Statusraden r tredje raden frn nederkanten och "
 "visar viktiga meddelanden.  "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "sekvenser skrivs med metatecknet (M) och och anges antingen med Esc-, Alt- "
 "eller Meta-tangenten beroende p dina tangentbordsinstllningar.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1220,7 +1220,7 @@ msgstr ""
 "huvudfnster. Alternativa tangenter visas inom parentes:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "aktivera/inaktivera"
 
@@ -1598,7 +1598,7 @@ msgstr "Argumentet \"%s\" har ett oavslutat \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Strngar med reguljra uttryck mste brja och sluta med ett \"-tecken"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Felaktigt reguljrt uttryck \"%s\": %s"
@@ -1802,9 +1802,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Dra in aktuell rad"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1838,7 +1838,7 @@ msgid "text replace"
 msgstr " (att erstta)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1851,7 +1851,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1872,7 +1872,7 @@ msgid "Could not fork"
 msgstr "Kunde inte grena"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1940,7 +1940,7 @@ msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 msgid "In Selection:  "
 msgstr "I markering:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano har slut p minne!"
 
@@ -1950,56 +1950,56 @@ msgstr "nano har slut p
 msgid "Unicode Input"
 msgstr "Unicode-inmatning"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "ndrad"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Visa"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Fr ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "och alla andra som vi har glmt..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Tack fr att du anvnder nano!"
 
diff --git 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: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "İptal edildi"
@@ -34,8 +34,8 @@ msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
@@ -46,48 +46,48 @@ msgstr "Bir üst dizine geçilemiyor"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Ara"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Büyük / Küçük Harfe Duyarlı]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Düzenli İfade]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Geriye Doğru]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Arama Döngülendi"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Bu tek bulgu"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr "Başka açık dosya yok"
 msgid "Switched to %s"
 msgstr "%s 'e geçildi"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
@@ -143,12 +143,12 @@ msgstr "Yeni Dosya"
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
@@ -205,7 +205,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
@@ -215,62 +215,62 @@ msgstr "Hatalı alıntı dizgesi %s: %s"
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%d satır yazıldı"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS Biçimi]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac Biçimi]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Yedek]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Seçimi Dosyanın Başına Ekle"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Seçimi Dosyaya Yaz"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Başına Eklenecek Dosya Adı"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Sonuna Eklenecek Dosya Adı"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Yazılacak Dosya Adı"
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Dosya var, ÜSTÜNE YAZILSIN MI?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(daha)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -428,33 +428,33 @@ msgstr "Sonraki Dosya"
 msgid "Go To Line"
 msgstr "Satıra Git"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Şu anki paragrafı yasla"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Yüklenmiş olan dosyayı kapat/nano'dan çık"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "nano'dan çık"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Yürütülmekte olan dosyayı diske yaz"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Şu anki paragrafı yasla"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Şu anki dosyaya başka bir dosya ekle"
@@ -734,230 +734,230 @@ msgid "Go to directory"
 msgstr "Dizine git"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Yaz"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Yasla"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Dosya Oku"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Metni Kes"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Yaslamayı Geri Al"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Kesmeyi Geri Al"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Denetime"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Metni İşaretle"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Metni Kes"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Metni Kes"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Kesmeyi Geri Al"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "İleri"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Sonraki Kelime"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr "Önceki Sayfa"
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr "Sonraki Dosya"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Diğer Köşeli Ayracı Bul"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Sekme (TAB)"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Gir Tuşu (Enter)"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Sil"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Geri tuşu"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Yumuşak kaydırma"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Dosya arabelleklerini çokla"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Fare Desteği"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac biçimi ile ilgili bir şey yok"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "Askıya Al"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -984,7 +984,7 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -993,7 +993,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1013,7 +1013,7 @@ msgstr ""
 " Satıra Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1044,7 +1044,7 @@ msgstr ""
 " Dosya Ekle kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1053,7 +1053,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1083,7 +1083,7 @@ msgstr ""
 " Dosyayı Yaz kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1108,7 +1108,7 @@ msgstr ""
 " Dosya Tarayıcısı kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1136,13 +1136,13 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1165,7 +1165,7 @@ msgstr ""
 " Tarayıcı Dizine Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1189,7 +1189,7 @@ msgstr ""
 " Yazım Denetimi kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1210,7 +1210,7 @@ msgstr ""
 " Harici Komut kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1241,7 +1241,7 @@ msgstr ""
 "kullanılabilir.  Alternatif tuşlar parantez içinde gösterilmişlerdir:\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1252,7 +1252,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1261,7 +1261,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "etkin/etkisiz"
 
@@ -1667,7 +1667,7 @@ msgstr "%s argümanında sonlanmamış \" var"
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Düzenli ifade katarları, \" karakteri ile başlamalı ve bitmeli\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" yanlış bir düzenli ifade: %s"
@@ -1873,9 +1873,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Yürürlükteki fonksiyonu iptal et"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1909,7 +1909,7 @@ msgid "text replace"
 msgstr " (değiştirmek için)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1922,7 +1922,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1943,7 +1943,7 @@ msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2012,7 +2012,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano bellek dışı!"
 
@@ -2022,61 +2022,61 @@ msgstr "nano bellek dışı!"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " Değiştirildi "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr " Göster "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " DİZİN: "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr "Dosya: "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "satır %ld/%ld (%d%%), sütun %lu/%lu (%d%%), karakter %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "nano metin editörü"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "sürüm "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Size sağlayan: "
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuğumuz kişilere..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "nano kullandığınız için teşekkürler!\n"
diff --git a/po/uk.po b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2003-02-17 10:51+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr " Ҧ"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr ""
@@ -33,8 +33,8 @@ msgstr "
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "   %s: %s"
@@ -45,49 +45,49 @@ msgstr "
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " []"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " []"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " []"
 
 # message
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr " ˦ ,  "
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "  ЦĦ"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr "
 msgid "Switched to %s"
 msgstr "  %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr " "
 
@@ -151,12 +151,12 @@ msgstr "
 msgid "\"%s\" not found"
 msgstr "\"%s\"  "
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr " \"%s\"  Ҧ"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr " \"%s\"   "
@@ -213,7 +213,7 @@ msgstr ""
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "   %s: %s"
@@ -223,7 +223,7 @@ msgstr "
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -231,56 +231,56 @@ msgstr[0] "
 msgstr[1] " %d "
 msgstr[2] " %d ˦"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [ DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [ Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " []"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr " Ħ   (  )"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr " Ħ  "
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr " Ħ  "
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "'   "
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "'   "
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "'   "
 
-#: src/files.c:2012
+#: src/files.c:2017
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr " դ,  ?"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(̦)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -438,33 +438,33 @@ msgstr "
 msgid "Go To Line"
 msgstr " "
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Ҧ  "
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "  æ"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "   /  nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Ȧ  nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "    "
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Ҧ  "
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "    "
@@ -745,230 +745,230 @@ msgid "Go to directory"
 msgstr " Ҧ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Ҧ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr ". "
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Ҧ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Ҧ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "Ҧ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "æ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr ""
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "ͦ"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ҧ"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ҧ"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "Ҧ"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr ""
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr ""
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr ""
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:805
+#: src/global.c:803
 #, fuzzy
 msgid "Prev Line"
 msgstr ".."
 
-#: src/global.c:808
+#: src/global.c:806
 #, fuzzy
 msgid "Next Line"
 msgstr " "
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr ""
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr ""
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "  "
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Φ "
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr " "
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr ""
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "æ"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "¦"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr " "
 
-#: src/global.c:1221
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Ԧ æ "
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr " "
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "צ  "
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "-Ҧ"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Ҧ  ˦"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr ""
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1241
+#: src/global.c:1237
 #, fuzzy
 msgid "Backup files"
 msgstr "  Ц"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "˦  Ҧ"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr " ۦ"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "   DOS/Mac "
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr " -"
 
-#: src/help.c:242
+#: src/help.c:236
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -994,7 +994,7 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ :\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1003,7 +1003,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1023,7 +1023,7 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ _:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1054,7 +1054,7 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ  :\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1063,7 +1063,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:281
+#: src/help.c:275
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1092,7 +1092,7 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ  \n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1117,7 +1117,7 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ  ̦:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1144,13 +1144,13 @@ msgstr ""
 " Φ æΦ צۦ Φ  ͦ :\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1174,7 +1174,7 @@ msgstr ""
 "_Ҧ:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1198,7 +1198,7 @@ msgstr ""
 " Φ ۦ æ Φ  ͦ :\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1218,7 +1218,7 @@ msgstr ""
 " Φ צۦ Φ   ͦ:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1248,7 +1248,7 @@ msgstr ""
 "צΦ . צ ¦æ Φ  :\n"
 "\n"
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1259,7 +1259,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1268,7 +1268,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "/"
 
@@ -1672,7 +1672,7 @@ msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "  ڦ Φ   ˦  '\"'\n"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr " צ   \"%s\": %s"
@@ -1880,9 +1880,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "  æ"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1916,7 +1916,7 @@ msgid "text replace"
 msgstr " ( ͦ)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1929,7 +1929,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1950,7 +1950,7 @@ msgid "Could not fork"
 msgstr "   fork()"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -2019,7 +2019,7 @@ msgstr ""
 msgid "In Selection:  "
 msgstr " Ħ  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr " צϧ 'Ԧ  nano!"
 
@@ -2029,61 +2029,61 @@ msgstr "
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 #, fuzzy
 msgid "Modified"
 msgstr " ͦ "
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 #, fuzzy
 msgid "View"
 msgstr "  "
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 #, fuzzy
 msgid "DIR:"
 msgstr " : "
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 #, fuzzy
 msgid "File:"
 msgstr ": "
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr " %ld/%ld (%d%%),  %lu/%lu (%d%%, ̦ %lu/%ld (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "  nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 #, fuzzy
 msgid "version"
 msgstr "Ӧ "
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "  :"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr " :"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation (   )"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr " ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "    ..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "դ   ,   nano!\n"
diff --git a/po/vi.po b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2008-06-26 22:42+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "Đi tới thư mục"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "Đã hủy bỏ"
@@ -34,8 +34,8 @@ msgstr "Không đi ra được bên ngoài của %s trong chế độ hạn ch
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Lỗi đọc %s: %s"
@@ -46,48 +46,48 @@ msgstr "Không thể lên trên một thư mục"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(thư mục)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(thư mục cha)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "Tìm kiếm"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Tính đến kiểu chữ]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [Biểu thức chính quy]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [Ngược lại]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "Tìm đã ngắt dòng"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "Đây là tương ứng duy nhất"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "Không có mẫu tìm kiếm hiện thời"
 
@@ -105,7 +105,7 @@ msgstr "Không còn bộ đệm mở tập tin nữa"
 msgid "Switched to %s"
 msgstr "Đã chuyển tới %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "Bộ đệm mới"
 
@@ -142,12 +142,12 @@ msgstr "Tập tin mới"
 msgid "\"%s\" not found"
 msgstr "Không tìm thấy \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" là một thư mục"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" là một tập tin thiết bị"
@@ -202,7 +202,7 @@ msgstr "Quá nhiều tập tin lưu trữ?"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Lỗi ghi nhớ %s: %s"
@@ -212,61 +212,61 @@ msgstr "Lỗi ghi nhớ %s: %s"
 msgid "Error writing temp file: %s"
 msgstr "Lỗi ghi nhớ tập tin tạm thời: %s"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Đã ghi %lu dòng"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [Định dạng DOS]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Định dạng Mac]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [Lưu trữ]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "Thêm lựa chọn vào trước Tập tin"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "Thêm lựa chọn vào sau Tập tin"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "Ghi nhớ lựa chọn vào một tập tin"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "Tên tập tin để thêm vào trước"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "Tên tập tin để thêm vào sau"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "Tên tập tin để ghi nhớ"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "Tập tin đã tồn tại, GHI ĐÈ LÊN ? "
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Ghi nhớ tập tin dưới TÊN KHÁC ? "
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -415,32 +415,32 @@ msgstr "Chèn tập tin"
 msgid "Go To Line"
 msgstr "Tới dòng"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "Sắp chữ đúng hàng cho đoạn văn hiện thời"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "Dừng hàm hiện thời"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Đóng bộ đệm tập tin hiện thời/Thoát nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "Thoát khỏi nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "Ghi nhớ tập tin hiện thời lên đĩa"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "Sắp chữ đúng hàng cho đoạn văn hiện thời"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "Chèn tập tin khác vào tập tin hiện thời"
@@ -687,221 +687,221 @@ msgid "Go to directory"
 msgstr "Đi tới thư mục"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "Đóng"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "Ghi"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "Sắp chữ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "Đọc tập tin"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "Cắt văn bản"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "Hủy sắp chữ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "Hủy cắt văn bản"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "Vị trí con trỏ"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "Chính tả"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "Đánh dấu văn bản"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "Chép văn bản"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "Thụt lề văn bản"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "Hủy thụt lề văn bản"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "Tiếp"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "Lùi"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "Từ kế"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "Dòng trước"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "Dòng kế"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "Tìm ngoặc đơn khác"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "Đưa lên"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "Đưa xuống"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "Tập tin trước"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "Tập tin kế"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "Dữ liệu nhập nguyên bản"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "Xoá lùi"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "Cắt đến cuối"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "Đếm từ"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con trỏ"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Sử dụng dòng thêm để soạn thảo"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Cuộn trơn mượt"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "Chiếu sáng cú pháp"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "Tự động thụt lề"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "Ngắt dòng dài"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "Lưu trữ tập tin"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "Bộ đệm đa tập tin"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "Không chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -923,7 +923,7 @@ msgstr ""
 "kiếm.  Không nhập văn bản nào và gõ Enter sẽ thực hiện tìm kiếm ngay trước "
 "này.  "
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -937,7 +937,7 @@ msgstr ""
 " Những phím chức năng sau có trong chế độ Tìm kiếm:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -956,7 +956,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong chế độ Tới dòng:\n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -979,7 +979,7 @@ msgstr ""
 "việc nạp tập tin đó vào một bộ đệm riêng (sử dụng Meta-< và > để chuyển giữa "
 "các bộ đệm này).  "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -993,7 +993,7 @@ msgstr ""
 " Có những phím chức năng sau trong chế độ Chèn Tập tin:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1021,7 +1021,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong chế độ Ghi nhớ Tập tin:\n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1045,7 +1045,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1069,7 +1069,7 @@ msgstr ""
 "này.\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1077,7 +1077,7 @@ msgstr ""
 "Có thể dùng các phím chức năng sau trong chế độ Tìm trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1100,7 +1100,7 @@ msgstr ""
 "mục:\n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1123,7 +1123,7 @@ msgstr ""
 " Có các chức năng sau trong chế độ Kiểm tra chính tả:\n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 " Có thể dùng các phím sau trong chế độ Thực hiện Câu lệnh:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1163,7 +1163,7 @@ msgstr ""
 "đang soạn thảo.  Dòng trạng thái là dòng thứ ba từ dưới lên và hiển thị "
 "những thông báo quan trọng."
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1181,7 +1181,7 @@ msgstr ""
 "ký hiệu bằng ký tự Meta (M) và nhập vào bằng (một trong) các phím Esc, Alt "
 "hay Meta tùy thuộc vào cấu hình bàn phím.  "
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1194,7 +1194,7 @@ msgstr ""
 "sổ soạn thảo chính.  Các phím tương đương đặt trong dấu ngoặc đơn:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "bật/tắt"
 
@@ -1571,7 +1571,7 @@ msgstr "Đối số « %s » không kết thúc \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Biểu thức chính quy phải bắt đầu và kết thúc bởi một ký tự \""
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Biểu thức chính quy xấu \"%s\": %s"
@@ -1784,9 +1784,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "Thụt lề dòng hiện tại"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1820,7 +1820,7 @@ msgid "text replace"
 msgstr " (thay thế)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1833,7 +1833,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1854,7 +1854,7 @@ msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1922,7 +1922,7 @@ msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 msgid "In Selection:  "
 msgstr "Trong lựa chọn:  "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano làm tràn bộ nhớ!"
 
@@ -1932,55 +1932,55 @@ msgstr "nano làm tràn bộ nhớ!"
 msgid "Unicode Input"
 msgstr "Dữ liệu nhập Unicode"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "Đã sửa đổi"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "Xem"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "THƯ MỤC:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "Tập tin:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "dòng %ld/%ld (%d%%), cột %lu/%lu (%d%%), ký tự %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "Được đem tới bởi:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "Đặc biệt cảm ơn:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần mềm Tự do (FSF)"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "Cho ncurses:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "và những người khác mà chúng tôi quên..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -4,10 +4,10 @@
 # LI Daobing <lidaobing@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.3\n"
+"Project-Id-Version: nano 2.1.5pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
-"PO-Revision-Date: 2008-08-07 21:12+0800\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
+"PO-Revision-Date: 2008-08-21 21:40+0800\n"
 "Last-Translator: Li Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
 "sourceforge.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "已取消"
@@ -32,8 +32,8 @@ msgstr "在限制模式中无法至 %s 外部"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读取 %s 时发生错误: %s"
@@ -44,48 +44,48 @@ msgstr "无法上移一个目录"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(目录)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr "(父目录)"
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "搜寻"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [符合大小写]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [正则表示式]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [向后搜寻]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "已从头搜寻"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "这是惟一出现之处"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "没有当前搜索模式"
 
@@ -103,7 +103,7 @@ msgstr "无多余文件缓冲区可开启"
 msgid "Switched to %s"
 msgstr "切换至 %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "新缓冲区"
 
@@ -140,12 +140,12 @@ msgstr "新文件"
 msgid "\"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
@@ -188,9 +188,9 @@ msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 设定下，无法前引或附加至符号连结档"
 
 #: src/files.c:1477 src/files.c:1502 src/files.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "写入暂存文件 %s 时发生错误"
+msgstr "写入备份文件 %s 时发生错误: %s"
 
 #: src/files.c:1478 src/nano.c:675
 msgid "Too many backup files?"
@@ -198,7 +198,7 @@ msgstr "太多备份文件？"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入 %s 时发生错误: %s"
@@ -208,61 +208,61 @@ msgstr "写入 %s 时发生错误: %s"
 msgid "Error writing temp file: %s"
 msgstr "写入暂存文件 %s 时发生错误"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已写入 %lu 行"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [备份]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "前引选择部份于文件"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "附加选择部份至文件"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "写入选择部份至文件"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "要前引于的文件名称"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "要附加至的文件名称"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "要写入的文件名称"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "文件已存在，要覆盖吗？"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以不同的名称存档？"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, c-format
 msgid ""
 "\n"
@@ -411,32 +411,32 @@ msgstr "插入文件"
 msgid "Go To Line"
 msgstr "跳行"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "对齐当前段落"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "取消当前功能"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:493
+#: src/global.c:496
 msgid "Close the current file buffer / Exit from nano"
 msgstr "关闭当前文件缓冲区 / 离开 nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "离开 nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "写入当前文件至磁盘"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "对齐当前段落"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "插入其他文件至当前文件"
@@ -682,221 +682,221 @@ msgid "Go to directory"
 msgstr "跳至目录"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "写入"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "对齐"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "读档"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "剪下文字"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "还原对齐"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 msgid "UnCut Text"
 msgstr "还原剪下"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "游标位置"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "拼写检查"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:766
+#: src/global.c:764
 msgid "Copy Text"
 msgstr "复制文字"
 
-#: src/global.c:769
+#: src/global.c:767
 msgid "Indent Text"
 msgstr "缩进文字"
 
-#: src/global.c:772
+#: src/global.c:770
 msgid "Unindent Text"
 msgstr "取消缩进"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr "重做"
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "向后"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "后一个字"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "前一个字"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "上行"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "下行"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "寻找其他括号"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "向上卷动"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "向下卷动"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "上个文件"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "下个文件"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "原形输入"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "跳格键"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "输入键"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "删除键"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "退格键"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "删至末端"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "计算字数"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "辅助模式"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "持续显示游标位置"
 
-#: src/global.c:1223
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "编辑时使用多一行"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "平滑式卷动画面"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "语法色彩标示"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "智慧型 HOME 按键"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "自动缩排"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "剪下至行尾"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "长行转换"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入跳格符号至空白的转换"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "备份文件"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "多重文件缓冲区"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "鼠标支持"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "不从 DOS/Mac 格式转换"
 
-#: src/global.c:1249
+#: src/global.c:1245
 msgid "Suspension"
 msgstr "暂停"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -916,7 +916,7 @@ msgstr ""
 " 前次搜索的字串将会显示在 搜索: 提示符号后面的括号中。不输入任何文字 而直接按"
 "下输入键则会履行前次的搜索。"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -930,7 +930,7 @@ msgstr ""
 " 以下的功能键可用于搜索模式:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -949,7 +949,7 @@ msgstr ""
 " 以下的功能键可用于跳行模式: \n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -969,7 +969,7 @@ msgstr ""
 "multibuffer、Meta-F 开关，或者 nanorc 文件来启动的话，所插入的文件 将会被载入"
 "另外的缓冲区中 (利用 Meta-< 和 > 在文件缓冲区间切换)。 "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -983,7 +983,7 @@ msgstr ""
 " 以下的功能键可用于插入文件模式:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1009,7 +1009,7 @@ msgstr ""
 " 以下的功能键可用于写入文件模式: \n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1031,7 +1031,7 @@ msgstr ""
 " 以下的功能键可用于文件选单: \n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1053,7 +1053,7 @@ msgstr ""
 "下输入键则会履行前次的搜索。\n"
 "\n"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1061,7 +1061,7 @@ msgstr ""
 "在搜索模式可使用如下的功能键:\n"
 "\n"
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1083,7 +1083,7 @@ msgstr ""
 " 以下的功能键可用于跳至目录模式: \n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1105,7 +1105,7 @@ msgstr ""
 " 以下的功能键可用于拼写检查模式: \n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1124,7 +1124,7 @@ msgstr ""
 " 以下的功能键可用于执行命令模式:\n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1144,7 +1144,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:372
+#: src/help.c:366
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1159,7 +1159,7 @@ msgstr ""
 "组 (Escape-key) 序列是以 \"中介\" (Meta, M) 符号表示，它 可以依照您的键盘设"
 "定，利用 Esc，Alt 或 Meta 来输入。"
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1171,7 +1171,7 @@ msgstr ""
 "对应的字 元。下列按键组合可用于主要编辑区，替代按键则显示于括弧内:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "开启/关闭"
 
@@ -1548,7 +1548,7 @@ msgstr "参数 %s 有未封闭的 \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示式字串必须以 \" 字符开始及结束"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "非法的正则表示式 \"%s\": %s"
@@ -1749,8 +1749,9 @@ msgid "Nothing in undo buffer!"
 msgstr "没有可撤销的操作！"
 
 #: src/text.c:389 src/text.c:523
-msgid "Couldnt match current undo line"
-msgstr "无法匹配当前撤销行"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr "内部错误: 无法匹配行 %d。请保存你的工作"
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1781,8 +1782,8 @@ msgid "text replace"
 msgstr "文本替换"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
-msgstr "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
+msgstr "内部错误: 未知类型。请保存你的工作"
 
 #: src/text.c:492
 #, c-format
@@ -1794,8 +1795,8 @@ msgid "Nothing to re-do!"
 msgstr "没有可重做的操作！"
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
-msgstr "无法找到上次的撤销操作来重做，嗯"
+msgid "Internal error: Redo setup failed.  Please save your work"
+msgstr "内部错误: 重做设置失败。请保存你的工作"
 
 #: src/text.c:579
 msgid "line cut"
@@ -1815,8 +1816,8 @@ msgid "Could not fork"
 msgstr "执行功能无效"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
-msgstr "警告: 尝试添加未知数据到撤销结构，我已经保存了你的工作"
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部错误: 未知类型。请保存你的工作。"
 
 #: src/text.c:1784
 #, c-format
@@ -1883,7 +1884,7 @@ msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 msgid "In Selection:  "
 msgstr "于选择部份: "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano 已耗尽内存！"
 
@@ -1893,55 +1894,55 @@ msgstr "nano 已耗尽内存！"
 msgid "Unicode Input"
 msgstr "Unicode 输入"
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "已更动"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "观看"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "目录:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "文件:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "行 %ld/%ld (%d%%), 列 %lu/%lu (%d%%), 字符 %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "nano 文字编辑器"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "来自于:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "特别感谢:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "自由软体基金会"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "以及其他我们不记得的人..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "谢谢您使用 nano！"
diff --git a/po/zh_TW.po b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.3.10pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-09 06:24-0400\n"
+"POT-Creation-Date: 2008-08-30 17:39-0400\n"
 "PO-Revision-Date: 2005-12-13 09:33+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/browser.c:233 src/browser.c:828 src/files.c:771 src/files.c:1909
+#: src/browser.c:233 src/browser.c:830 src/files.c:771 src/files.c:1912
 #: src/nano.c:1016 src/search.c:219 src/search.c:951 src/search.c:1016
 msgid "Cancelled"
 msgstr "已取消"
@@ -32,8 +32,8 @@ msgstr "在限制模式中無法至 %s 外部"
 
 #: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:633
 #: src/files.c:642 src/files.c:1436 src/files.c:1527 src/files.c:1575
-#: src/files.c:1596 src/files.c:1719 src/files.c:2538 src/rcfile.c:494
-#: src/rcfile.c:1064
+#: src/files.c:1596 src/files.c:1719 src/files.c:2543 src/rcfile.c:494
+#: src/rcfile.c:1067
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀取 %s 時發生錯誤: %s"
@@ -44,48 +44,48 @@ msgstr "無法上移一個目錄"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:663 src/browser.c:672
+#: src/browser.c:665 src/browser.c:674
 msgid "(dir)"
 msgstr "(目錄)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:669
+#: src/browser.c:671
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:799 src/search.c:184
+#: src/browser.c:801 src/search.c:184
 msgid "Search"
 msgstr "搜尋"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:803 src/search.c:188
+#: src/browser.c:805 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [符合大小寫]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:809 src/search.c:194
+#: src/browser.c:811 src/search.c:194
 msgid " [Regexp]"
 msgstr " [正規表示式]"
 
 #. TRANSLATORS: This string is just a modifier for the search
 #. * prompt; no grammar is implied.
-#: src/browser.c:815 src/search.c:200
+#: src/browser.c:817 src/search.c:200
 msgid " [Backwards]"
 msgstr " [向後搜尋]"
 
-#: src/browser.c:907 src/browser.c:915 src/search.c:380
+#: src/browser.c:909 src/browser.c:917 src/search.c:380
 msgid "Search Wrapped"
 msgstr "已從頭搜尋"
 
-#: src/browser.c:1004 src/browser.c:1037 src/search.c:497 src/search.c:500
+#: src/browser.c:1006 src/browser.c:1039 src/search.c:497 src/search.c:500
 #: src/search.c:557 src/search.c:560
 msgid "This is the only occurrence"
 msgstr "這是惟一出現之處"
 
-#: src/browser.c:1040 src/search.c:566
+#: src/browser.c:1042 src/search.c:566
 msgid "No current search pattern"
 msgstr "沒有符合目前搜尋形式者"
 
@@ -103,7 +103,7 @@ msgstr "無多餘檔案緩衝區可開啟"
 msgid "Switched to %s"
 msgstr "切換至 %s"
 
-#: src/files.c:247 src/global.c:458 src/winio.c:2129
+#: src/files.c:247 src/global.c:458 src/winio.c:2134
 msgid "New Buffer"
 msgstr "新緩衝區"
 
@@ -140,12 +140,12 @@ msgstr "新檔案"
 msgid "\"%s\" not found"
 msgstr "找不到 \"%s\""
 
-#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1055
+#: src/files.c:628 src/rcfile.c:486 src/rcfile.c:1017 src/rcfile.c:1058
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1056
+#: src/files.c:629 src/rcfile.c:487 src/rcfile.c:1018 src/rcfile.c:1059
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個裝置檔案"
@@ -199,7 +199,7 @@ msgstr "太多備份檔案？"
 
 #: src/files.c:1551 src/files.c:1608 src/files.c:1627 src/files.c:1639
 #: src/files.c:1663 src/files.c:1681 src/files.c:1691 src/files.c:1727
-#: src/files.c:2611 src/files.c:2620
+#: src/files.c:1732 src/files.c:2616 src/files.c:2625
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
@@ -209,61 +209,61 @@ msgstr "寫入 %s 時發生錯誤: %s"
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
 
-#: src/files.c:1761
+#: src/files.c:1764
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已寫入 %lu 列"
 
-#: src/files.c:1865
+#: src/files.c:1868
 msgid " [DOS Format]"
 msgstr " [DOS 格式]"
 
-#: src/files.c:1866
+#: src/files.c:1869
 msgid " [Mac Format]"
 msgstr " [Mac 格式]"
 
-#: src/files.c:1868
+#: src/files.c:1871
 msgid " [Backup]"
 msgstr " [備份]"
 
-#: src/files.c:1876
+#: src/files.c:1879
 msgid "Prepend Selection to File"
 msgstr "前引選擇部份於檔案"
 
-#: src/files.c:1877
+#: src/files.c:1880
 msgid "Append Selection to File"
 msgstr "附加選擇部份至檔案"
 
-#: src/files.c:1878
+#: src/files.c:1881
 msgid "Write Selection to File"
 msgstr "寫入選擇部份至檔案"
 
-#: src/files.c:1881
+#: src/files.c:1884
 msgid "File Name to Prepend to"
 msgstr "要前引於的檔案名稱"
 
-#: src/files.c:1882
+#: src/files.c:1885
 msgid "File Name to Append to"
 msgstr "要附加至的檔案名稱"
 
-#: src/files.c:1883
+#: src/files.c:1886
 msgid "File Name to Write"
 msgstr "要寫入的檔案名稱"
 
-#: src/files.c:2012
+#: src/files.c:2017
 msgid "File exists, OVERWRITE ? "
 msgstr "檔案已存在，要覆寫嗎？"
 
-#: src/files.c:2021
+#: src/files.c:2026
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以不同的名稱存檔？"
 
-#: src/files.c:2458
+#: src/files.c:2463
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2541 src/rcfile.c:995
+#: src/files.c:2546 src/rcfile.c:995
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -417,33 +417,33 @@ msgstr "插入檔案"
 msgid "Go To Line"
 msgstr "跳列"
 
+#: src/global.c:487
+msgid "Justify the current paragraph"
+msgstr "對齊目前段落"
+
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:489
+#: src/global.c:492
 msgid "Cancel the current function"
 msgstr "取消目前功能"
 
-#: src/global.c:490
+#: src/global.c:493
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:496
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "關閉目前檔案緩衝區並離開 nano"
 
-#: src/global.c:495
+#: src/global.c:498
 msgid "Exit from nano"
 msgstr "離開 nano"
 
-#: src/global.c:499
+#: src/global.c:502
 msgid "Write the current file to disk"
 msgstr "寫入目前檔案至磁碟"
 
-#: src/global.c:501
-msgid "Justify the current paragraph"
-msgstr "對齊目前段落"
-
 #: src/global.c:504
 msgid "Insert another file into the current one"
 msgstr "插入它檔至目前檔案"
@@ -722,227 +722,227 @@ msgid "Go to directory"
 msgstr "跳至目錄"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:657
+#: src/global.c:655
 msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:668
+#: src/global.c:666
 msgid "WriteOut"
 msgstr "寫入"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:673
+#: src/global.c:671
 msgid "Justify"
 msgstr "對齊"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:682
 msgid "Read File"
 msgstr "讀檔"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:701
+#: src/global.c:699
 msgid "Cut Text"
 msgstr "剪下文字"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:706
+#: src/global.c:704
 msgid "UnJustify"
 msgstr "還原對齊"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:711
+#: src/global.c:709
 #, fuzzy
 msgid "UnCut Text"
 msgstr "還原剪下"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:716 src/global.c:744
+#: src/global.c:714 src/global.c:742
 msgid "Cur Pos"
 msgstr "游標位置"
 
 #. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:726
+#: src/global.c:724
 msgid "To Spell"
 msgstr "拼字檢查"
 
-#: src/global.c:760
+#: src/global.c:758
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:766
+#: src/global.c:764
 #, fuzzy
 msgid "Copy Text"
 msgstr "剪下文字"
 
-#: src/global.c:769
+#: src/global.c:767
 #, fuzzy
 msgid "Indent Text"
 msgstr "剪下文字"
 
-#: src/global.c:772
+#: src/global.c:770
 #, fuzzy
 msgid "Unindent Text"
 msgstr "還原剪下"
 
-#: src/global.c:775
+#: src/global.c:773
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:778
+#: src/global.c:776
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:789
+#: src/global.c:787
 msgid "Forward"
 msgstr "向前"
 
-#: src/global.c:793
+#: src/global.c:791
 msgid "Back"
 msgstr "向後"
 
-#: src/global.c:798
+#: src/global.c:796
 msgid "Next Word"
 msgstr "後一個字"
 
-#: src/global.c:801
+#: src/global.c:799
 msgid "Prev Word"
 msgstr "前一個字"
 
-#: src/global.c:805
+#: src/global.c:803
 msgid "Prev Line"
 msgstr "上列"
 
-#: src/global.c:808
+#: src/global.c:806
 msgid "Next Line"
 msgstr "下列"
 
-#: src/global.c:811
+#: src/global.c:809
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:814
+#: src/global.c:812
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:826
+#: src/global.c:824
 msgid "Find Other Bracket"
 msgstr "尋找其他括號"
 
-#: src/global.c:829
+#: src/global.c:827
 msgid "Scroll Up"
 msgstr "向上捲動"
 
-#: src/global.c:832
+#: src/global.c:830
 msgid "Scroll Down"
 msgstr "向下捲動"
 
-#: src/global.c:837
+#: src/global.c:835
 msgid "Previous File"
 msgstr "上個檔案"
 
-#: src/global.c:839
+#: src/global.c:837
 msgid "Next File"
 msgstr "下個檔案"
 
 #. TRANSLATORS: This is displayed when the next keystroke will be
 #. * inserted verbatim.
-#: src/global.c:843 src/text.c:2949
+#: src/global.c:841 src/text.c:2949
 msgid "Verbatim Input"
 msgstr "原形輸入"
 
-#: src/global.c:848
+#: src/global.c:846
 msgid "Tab"
 msgstr "跳格鍵"
 
-#: src/global.c:851
+#: src/global.c:849
 msgid "Enter"
 msgstr "輸入鍵"
 
-#: src/global.c:854
+#: src/global.c:852
 msgid "Delete"
 msgstr "刪除鍵"
 
-#: src/global.c:857
+#: src/global.c:855
 msgid "Backspace"
 msgstr "退格鍵"
 
-#: src/global.c:874
+#: src/global.c:872
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:887
+#: src/global.c:885
 msgid "Word Count"
 msgstr "計算字數"
 
-#: src/global.c:1219
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "輔助模式"
 
-#: src/global.c:1221
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "持續顯示游標位置"
 
-#: src/global.c:1223
+#: src/global.c:1219
 #, fuzzy
 msgid "Use of one more line for editing"
 msgstr "編輯時使用更多空間"
 
-#: src/global.c:1225
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "平滑式捲動畫面"
 
-#: src/global.c:1227
+#: src/global.c:1223
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1229
+#: src/global.c:1225
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1231
+#: src/global.c:1227
 msgid "Smart home key"
 msgstr "智慧型 HOME 按鍵"
 
-#: src/global.c:1233
+#: src/global.c:1229
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1235
+#: src/global.c:1231
 msgid "Cut to end"
 msgstr "剪下至列尾"
 
-#: src/global.c:1237
+#: src/global.c:1233
 msgid "Long line wrapping"
 msgstr "長列轉換"
 
-#: src/global.c:1239
+#: src/global.c:1235
 msgid "Conversion of typed tabs to spaces"
 msgstr "已輸入跳格符號至空白的轉換"
 
-#: src/global.c:1241
+#: src/global.c:1237
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1243
+#: src/global.c:1239
 msgid "Multiple file buffers"
 msgstr "多重檔案緩衝區"
 
-#: src/global.c:1245
+#: src/global.c:1241
 msgid "Mouse support"
 msgstr "滑鼠支援"
 
-#: src/global.c:1247
+#: src/global.c:1243
 msgid "No conversion from DOS/Mac format"
 msgstr "不從 DOS/Mac 格式轉檔"
 
-#: src/global.c:1249
+#: src/global.c:1245
 #, fuzzy
 msgid "Suspension"
 msgstr "暫停"
 
-#: src/help.c:242
+#: src/help.c:236
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -962,7 +962,7 @@ msgstr ""
 " 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
 "下輸入鍵則會履行前次的搜尋。"
 
-#: src/help.c:251
+#: src/help.c:245
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -976,7 +976,7 @@ msgstr ""
 " 以下的功能鍵可用於搜尋模式:\n"
 "\n"
 
-#: src/help.c:257
+#: src/help.c:251
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -995,7 +995,7 @@ msgstr ""
 " 以下的功能鍵可用於跳列模式: \n"
 "\n"
 
-#: src/help.c:266
+#: src/help.c:260
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1015,7 +1015,7 @@ msgstr ""
 "multibuffer、Meta-F 開關，或者 nanorc 檔案來啟動的話，所插入的檔案 將會被載入"
 "另外的緩衝區中 (利用 Meta-< 和 > 在檔案緩衝區間切換)。 "
 
-#: src/help.c:275
+#: src/help.c:269
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1029,7 +1029,7 @@ msgstr ""
 " 以下的功能鍵可用於插入檔案模式:\n"
 "\n"
 
-#: src/help.c:281
+#: src/help.c:275
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1055,7 +1055,7 @@ msgstr ""
 " 以下的功能鍵可用於寫入檔案模式: \n"
 "\n"
 
-#: src/help.c:295
+#: src/help.c:289
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1077,7 +1077,7 @@ msgstr ""
 " 以下的功能鍵可用於檔案選單: \n"
 "\n"
 
-#: src/help.c:308
+#: src/help.c:302
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1099,13 +1099,13 @@ msgstr ""
 " 前次搜尋的字串將會顯示在 搜尋: 提示符號後面的括號中。不輸入任何文字 而直接按"
 "下輸入鍵則會履行前次的搜尋。"
 
-#: src/help.c:317
+#: src/help.c:311
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:321
+#: src/help.c:315
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1127,7 +1127,7 @@ msgstr ""
 " 以下的功能鍵可用於跳至目錄模式: \n"
 "\n"
 
-#: src/help.c:334
+#: src/help.c:328
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1150,7 +1150,7 @@ msgstr ""
 " 以下的功能鍵可用於拼字檢查模式: \n"
 "\n"
 
-#: src/help.c:349
+#: src/help.c:343
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1170,7 +1170,7 @@ msgstr ""
 " 以下的功能鍵可用於執行命令模式: \n"
 "\n"
 
-#: src/help.c:362
+#: src/help.c:356
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1191,7 +1191,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:372
+#: src/help.c:366
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1207,7 +1207,7 @@ msgstr ""
 "組 (Escape-key) 序列是以 \"中介\" (Meta, M) 符號表示，它 可以依照您的鍵盤設"
 "定，利用 Esc，Alt 或 Meta 來輸入。"
 
-#: src/help.c:381
+#: src/help.c:375
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1219,7 +1219,7 @@ msgstr ""
 "對應的字 元。下列按鍵組合可用於主要編輯區，替代按鍵則顯示於括弧內:\n"
 "\n"
 
-#: src/help.c:413 src/help.c:489
+#: src/help.c:407 src/help.c:483
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
@@ -1622,7 +1622,7 @@ msgstr "引數 %s 有未封閉的 \""
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正規表示式字串必須以 \" 字元開始及結束"
 
-#: src/rcfile.c:227 src/search.c:61
+#: src/rcfile.c:228 src/search.c:61
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "不良的正規表示式 \"%s\": %s"
@@ -1827,9 +1827,9 @@ msgid "Nothing in undo buffer!"
 msgstr ""
 
 #: src/text.c:389 src/text.c:523
-#, fuzzy
-msgid "Couldnt match current undo line"
-msgstr "從游標剪下至列尾"
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work"
+msgstr ""
 
 #: src/text.c:400 src/text.c:533
 msgid "text add"
@@ -1863,7 +1863,7 @@ msgid "text replace"
 msgstr " (置換)"
 
 #: src/text.c:487 src/text.c:633
-msgid "wtf?"
+msgid "Internal error: unknown type.  Please save your work"
 msgstr ""
 
 #: src/text.c:492
@@ -1876,7 +1876,7 @@ msgid "Nothing to re-do!"
 msgstr ""
 
 #: src/text.c:512
-msgid "Can't find previous undo to re-do, argh"
+msgid "Internal error: Redo setup failed.  Please save your work"
 msgstr ""
 
 #: src/text.c:579
@@ -1897,7 +1897,7 @@ msgid "Could not fork"
 msgstr "執行功能無效"
 
 #: src/text.c:882
-msgid "OOPS. Tried to add unknown thing to undo struct, I'd save your work"
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
 #: src/text.c:1784
@@ -1965,7 +1965,7 @@ msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 msgid "In Selection:  "
 msgstr "於選擇部份: "
 
-#: src/utils.c:368 src/utils.c:380
+#: src/utils.c:404 src/utils.c:416
 msgid "nano is out of memory!"
 msgstr "nano 已耗盡記憶體！"
 
@@ -1975,56 +1975,56 @@ msgstr "nano 已耗盡記憶體！"
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2110 src/winio.c:2114
+#: src/winio.c:2115 src/winio.c:2119
 msgid "Modified"
 msgstr "已更動"
 
-#: src/winio.c:2111
+#: src/winio.c:2116
 msgid "View"
 msgstr "觀看"
 
-#: src/winio.c:2125
+#: src/winio.c:2130
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2132
+#: src/winio.c:2137
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:3166
+#: src/winio.c:3171
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "列 %ld/%ld (%d%%), 行 %lu/%lu (%d%%), 字元 %lu/%lu (%d%%)"
 
-#: src/winio.c:3285
+#: src/winio.c:3290
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3286
+#: src/winio.c:3291
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3287
+#: src/winio.c:3292
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:3288
+#: src/winio.c:3293
 msgid "Special thanks to:"
 msgstr "特別感謝:"
 
-#: src/winio.c:3289
+#: src/winio.c:3294
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3290
+#: src/winio.c:3295
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3291
+#: src/winio.c:3296
 msgid "and anyone else we forgot..."
 msgstr "以及其他我們不記得的人..."
 
-#: src/winio.c:3292
+#: src/winio.c:3297
 msgid "Thank you for using nano!"
 msgstr "謝謝您使用 nano﹗"