diff --git a/BUGS b/BUGS
index 7e040b2301c2b7f2b97b5257e22d6f4e3c0b5977..8e2b913a108a6e790baaca4d899d21e89a01dabc 100644
--- a/BUGS
+++ b/BUGS
@@ -112,7 +112,7 @@
   Corsi) (58) [FIXED].
 - When page up is used after two page down's, the screen doesn't update
   properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systenms, marked cutting sna paste often screws up the
+- On BSD systems, marked cutting sna paste often screws up the
   last line in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
 
 ** Open BUGS **
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67bf5bdcff735aea8eebf89ec84e3c2d802379fd..047b1becd51b99f9092a1c608023d24115f3b699 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ files.c
 global.c
 move.c
 nano.c
+rcfile.c
 search.c
 utils.c
 winio.c
diff --git a/po/ca.po b/po/ca.po
index 2db1ba8151a4da6d1360ab862dd275d8e127a303..be2bc993abf83e219f0a2f26753ea62af604b8a0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-05-02 19:14+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <jordi@sindominio.net>\n"
@@ -473,9 +473,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -829,6 +829,55 @@ msgstr "He agafat Alt-[-%c! (%d)\n"
 msgid "I got Alt-%c! (%d)\n"
 msgstr "He agafat Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -999,6 +1048,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "línia %d de %d (%.0f%%), caràcter %d de %d (%.0f%%)"
 
diff --git a/po/cs.po b/po/cs.po
index ca7b370dcc7ec9327119972c1ac134c19fb1a93b..d069f5baf8f7d81827422455a4dcc202fc5bbd59 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "Last-Translator: Václav Haisman <V.Haisman@sh.cvut.cz>\n"
 "Language-Team: N/A\n"
 "MIME-Version: 1.0\n"
@@ -480,9 +480,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -838,6 +838,55 @@ msgstr "M
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Mám Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1012,6 +1061,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "øádka %d z %d (%.0f%%), znak %d z %d (%.0f%%)"
 
diff --git a/po/de.po b/po/de.po
index c6b3d7c88ee9a319cc1b2c19a0cc351867901f82..447a5ae83b04eb51492d4edfa61b100590db077c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-02-08 17:56+0200\n"
 "Last-Translator: Florian König <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\n"
@@ -477,9 +477,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -494,11 +494,11 @@ msgstr ""
 "zeigt wichtige Meldungen. Die untersten zwei Zeilen listen die "
 "meistgebrauchten Tastenkombinationen von nano auf.\n"
 "\n"
-" Tastenkombinationen werden wie folgt abgekärzt: Kombinationen mit der "
-"Strg-Taste werden mit einem ^ ausgedräckt. Escape-Sequenzen werden mit dem "
-"Meta (M)-Symbol angegeben und können je nach Tastatureinstellung mit Esc, "
-"Alt oder Meta eingegeben werden. | Die folgenden Tasten(kombinationen) sind "
-"im Hauptfenster verfügbar. Optionale Tasten sind eingeklammert.\n"
+" Tastenkombinationen werden wie folgt abgekärzt: Kombinationen mit der Strg-"
+"Taste werden mit einem ^ ausgedräckt. Escape-Sequenzen werden mit dem Meta "
+"(M)-Symbol angegeben und können je nach Tastatureinstellung mit Esc, Alt "
+"oder Meta eingegeben werden. | Die folgenden Tasten(kombinationen) sind im "
+"Hauptfenster verfügbar. Optionale Tasten sind eingeklammert.\n"
 "\n"
 
 #: nano.c:301
@@ -842,6 +842,55 @@ msgstr "Erhielt Alt-[-%c! (%d)\n"
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Erhielt Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1018,6 +1067,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "Zeile %d von %d (%.0f%%), Zeichen %d von %d (%.0f%%)"
 
diff --git a/po/es.po b/po/es.po
index c9251ee5eed99e95cdfe2f8f5eb443c3c905c38f..422bfc9f43d1a1f9ea1b1ee3d3ed1bab9f689812 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-05-02 19:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -473,9 +473,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -830,6 +830,57 @@ msgstr "
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Pillé Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+"\n"
+"Pulsa enter para iniciar nano\n"
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr "parse_rcfile: Comentario leído\n"
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr "Error en %s en línea %d: no entiendo el comando %s"
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr "parse_rcfile: Parseando opción %s\n"
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr "Error en %s en línea %d: la opción %s requiere un argumento"
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr "Error en %s en línea %d: tamaño de llenado %d demasiado pequeño"
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr "establecer marca %d!\n"
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr "quitar marca %d!\n"
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr "Errores encontrados en fichero .nanorc"
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr "Imposible abrir fichero ~/.nanorc, %s"
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -838,7 +889,7 @@ msgstr "B
 #: search.c:120
 #, c-format
 msgid "Regexp Search%s%s"
-msgstr "Busqueda con Regexp%s%s"
+msgstr "Búsqueda con Regexp%s%s"
 
 #: search.c:122
 #, c-format
@@ -1000,6 +1051,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "línea %d de %d (%.0f%%), carácter %d de %d (%.0f%%)"
 
diff --git a/po/fi.po b/po/fi.po
index 0657109f8c0b290e119b3dad58aa4c34a207d0ae..f1301cf88c5d96028fbabba12244c523154e2f92 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.18\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-01-12 17:21+02:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -473,9 +473,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -828,6 +828,55 @@ msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Vastaanotettu Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -999,6 +1048,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "rivi %d/%d (%.0f%%), merkki %d/%d (%.0f%%)"
 
diff --git a/po/fr.po b/po/fr.po
index 6b237333c627654635b4428a76852f1e2c010718..00b1b7cfaf386ba12b34c5025773ee5f9fc5c1cd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2000-07-09 01:32+0100\n"
 "Last-Translator: Clement Laforet <sheep.killer@free.fr>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -486,17 +486,17 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
 msgstr ""
 "Message d'aide de Nano\n"
-"L'éditeur Nano est conçu pour émuler les fonctions et la facilité "
-"d'utili-sation de l'éditeur PICO. Il y a quatre sections principales dans "
-"cet éditeur : la ligne du haut affiche la version du programme, le "
+"L'éditeur Nano est conçu pour émuler les fonctions et la facilité d'utili-"
+"sation de l'éditeur PICO. Il y a quatre sections principales dans cet "
+"éditeur : la ligne du haut affiche la version du programme, le "
 "fichieractuellement édité, et s'il a été modifié ou non. Ensuite il y a "
 "lafenêtre principale d'édition qui affiche le fichier en cours de "
 "modification.La ligne d'état est la troisième en partant du bas, elle "
@@ -851,6 +851,55 @@ msgstr "J'ai re
 msgid "I got Alt-%c! (%d)\n"
 msgstr "J'ai reçu Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, fuzzy, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1026,6 +1075,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "ligne %d sur %d (%.0f%%), caractère %d sur %d (%.0f%%)"
 
diff --git a/po/gl.po b/po/gl.po
index 6dc4822b272ca545ce32d34eff3c260fd360c1a3..1b524888096191d560ece4fdb052f956804ba452 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-04-30 00:16+02:00\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -470,9 +470,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -825,6 +825,55 @@ msgstr "
 msgid "I got Alt-%c! (%d)\n"
 msgstr "¡Recibiuse Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -995,6 +1044,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "liña %d de %d (%.0f%%), carácter %d de %d (%.0f%%)"
 
diff --git a/po/hu.po b/po/hu.po
index 1cbb5d7ee9043ff8f09576968b864ec1c21b1ea2..982d8b211a6b2e01c9f0b61f46d92c96670df55d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.99pre2\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-02-03 07:47-0000\n"
 "Last-Translator: Szabolcs Horvath <horvaths@penguinpowered.com>\n"
 "Language-Team: Hungarian <magyar@lists.linux.hu>\n"
@@ -474,9 +474,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -834,6 +834,55 @@ msgstr "Az Alt-[-%c billenty
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Az Alt-%c billentyûket lenyomtad! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1005,6 +1054,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr ""
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "%d(/%d). sor (%.0f%%) és a(z) %d(/%d). karakter (%.0f%%)"
 
diff --git a/po/id.po b/po/id.po
index 51f480084b2c0f65f9b9973e1d45e62d0c7dc97f..bcc5b622c92419389090fefede73363944d2bfef 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-1.0\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-02-08 10:09+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -474,9 +474,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -494,8 +494,8 @@ msgstr ""
 "\n"
 "Notasi untuk shortcut adalah sebagai berikut : urutan kunci Control "
 "dilambangkan\n"
-"dengan simbol caret (^) dan dimasukkan dengan menekan tombol Control (Ctrl). "
-"\n"
+"dengan simbol caret (^) dan dimasukkan dengan menekan tombol Control "
+"(Ctrl). \n"
 "Urutan kunci Escape dilambangkan dengan simbol Meta (M) dan dapat dimasukkan "
 "dengan \n"
 "menggunakan tombol Esc, Alt atau Meta tergantung pada setup keyboard anda. \n"
@@ -832,6 +832,55 @@ msgstr "Saya mendapat Alt-%c! (%d)\n"
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Saya mendapat Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1005,6 +1054,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "baris %d dari %d (%f.0f%%), karakter %d dari %d (%.0f%%)"
 
diff --git a/po/it.po b/po/it.po
index 02ad967125f86962aab6a4eccadf87f169a12b6f..d34b8589c35df45bb6d6fc675eface0c6a979510 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-05-13 17:17GMT\n"
 "Last-Translator: Marco Colombo <magicdice@inwind.it>\n"
 "Language-Team: Italiano\n"
@@ -476,9 +476,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -842,6 +842,55 @@ msgstr "Premuto Alt-[-%c! (%d)\n"
 msgid "I got Alt-%c! (%d)\n"
 msgstr "Premuto Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1012,6 +1061,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "linea %d di %d (%.0f%%), carattere %d di %d (%.0f%%)"
 
diff --git a/po/ru.po b/po/ru.po
index f01d0cbcc0a147c2b8d8c3c9bf9e62f6597a679a..3faf09bef2e011342955971f39b524d2860cf678 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.1\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-05-16 10:10+0200\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -474,9 +474,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -828,6 +828,55 @@ msgstr "
 msgid "I got Alt-%c! (%d)\n"
 msgstr "ðÏÊÍÁÌ Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -998,6 +1047,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "ÓÔÒÏËÁ %d ÉÚ %d (%.0f%%), ÓÉÍ×ÏÌ %d ÉÚ %d (%.0f%%)"
 
diff --git a/po/uk.po b/po/uk.po
index 739b98aaee1d8c89e2fc42d196ad6f5b5efcde80..2a55a1ccc0355898015d6abe9a67c9572ad05b06 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.0.1\n"
-"POT-Creation-Date: 2001-05-19 22:52-0400\n"
+"POT-Creation-Date: 2001-05-24 14:58+0200\n"
 "PO-Revision-Date: 2001-04-10 18:40+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <linux@lambada.rovno.ua>\n"
@@ -476,9 +476,9 @@ msgid ""
 "commonly used shortcuts in the editor.\n"
 "\n"
 " The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
+"with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-"
+"key sequences are notated with the Meta (M) symbol and can be entered using "
+"either the Esc, Alt or Meta key depending on your keyboard setup.  The "
 "following keystrokes are available in the main editor window. Optional keys "
 "are shown in parentheses:\n"
 "\n"
@@ -831,6 +831,55 @@ msgstr "
 msgid "I got Alt-%c! (%d)\n"
 msgstr "ñ ЦÊÍÁ× Alt-%c! (%d)\n"
 
+#: rcfile.c:75
+msgid ""
+"\n"
+"Press return to continue starting nano\n"
+msgstr ""
+
+#: rcfile.c:133
+msgid "parse_rcfile: Read a comment\n"
+msgstr ""
+
+#: rcfile.c:150
+#, c-format
+msgid "Error in %s on line %d: command %s not understood"
+msgstr ""
+
+#: rcfile.c:163
+#, c-format
+msgid "parse_rcfile: Parsing option %s\n"
+msgstr ""
+
+#: rcfile.c:179
+#, c-format
+msgid "Error in %s on line %d: option %s requires an argument"
+msgstr ""
+
+#: rcfile.c:190
+#, c-format
+msgid "Error in %s on line %d: requested fill size %d too small"
+msgstr ""
+
+#: rcfile.c:206
+#, c-format
+msgid "set flag %d!\n"
+msgstr ""
+
+#: rcfile.c:211
+#, c-format
+msgid "unset flag %d!\n"
+msgstr ""
+
+#: rcfile.c:220
+msgid "Errors found in .nanorc file"
+msgstr ""
+
+#: rcfile.c:229
+#, c-format
+msgid "Unable to open ~/.nanorc file, %s"
+msgstr ""
+
 #: search.c:118
 #, c-format
 msgid "Case Sensitive Regexp Search%s%s"
@@ -1001,6 +1050,7 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1407
+#, c-format
 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)"
 msgstr "ÒÑÄÏË %d Ú %d (%.0f%%), ̦ÔÅÒÁ %d Ú %d (%.0f%%)"
 
diff --git a/rcfile.c b/rcfile.c
index e6aa12f5b28712a9e7b44f27a02cae28b65d1e58..b0b0c4e0e61be9632b271587147492d244b73a01 100644
--- a/rcfile.c
+++ b/rcfile.c
@@ -160,7 +160,7 @@ void parse_rcfile(FILE *rcstream, char *filename)
 	    for (i = 0; i <= NUM_RCOPTS - 1; i++) {
 	        if (!strcasecmp(option, rcopts[i].name)) {
 #ifdef DEBUG
-		    fprintf(stderr, "parse_rcfile: Parsing option %s\n", 
+		    fprintf(stderr, _("parse_rcfile: Parsing option %s\n"), 
 				rcopts[i].name);
 #endif
 		    if (set == 1 || rcopts[i].flag == FOLLOW_SYMLINKS) {
@@ -203,12 +203,12 @@ void parse_rcfile(FILE *rcstream, char *filename)
 			} else 
 			    SET(rcopts[i].flag);
 #ifdef DEBUG
-			fprintf(stderr, "set flag %d!\n", rcopts[i].flag);
+			fprintf(stderr, _("set flag %d!\n"), rcopts[i].flag);
 #endif
 		    } else {
 			UNSET(rcopts[i].flag);
 #ifdef DEBUG
-			fprintf(stderr, "unset flag %d!\n", rcopts[i].flag);
+			fprintf(stderr, _("unset flag %d!\n"), rcopts[i].flag);
 #endif
 		   }			
 		}