0.7.96 release updates

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@775 dbcabf3a-b0e7-0310-adc4-f8d773084564

6 files changed, 174 insertions, 422 deletions

diff --git a/po/de.po b/po/de.po
index 598aeb9c..84b298b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Irssi 0.7.23\n"
-"POT-Creation-Date: 2000-09-26 18:28+0300\n"
+"POT-Creation-Date: 2000-10-19 21:57+0300\n"
 "PO-Revision-Date: 1999-12-01 10:35-0200\n"
 "Last-Translator: Thomas Heinen <cochi@uni-paderborn.de>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -29,63 +29,73 @@ msgstr ""
 msgid "Please wait, waiting for servers to close connections..\n"
 msgstr "Bitte warten, schliesse Serververbindungen..\n"
 
-#: src/core/network.c:480
+#: src/core/network.c:475
 msgid "Host not found"
 msgstr "Host nicht gefunden"
 
-#: src/core/network.c:482
+#: src/core/network.c:477
 msgid "No IP address found for name"
 msgstr "Keine IP Adresse zum Namen gefunden"
 
-#: src/core/network.c:484
+#: src/core/network.c:479
 msgid "A non-recovable name server error occurred"
 msgstr "Ein nicht behebbarer Nameserverfehler ist aufgetreten"
 
-#: src/core/network.c:486
+#: src/core/network.c:481
 msgid "A temporary error on an authoritative name server"
 msgstr "Temporaerer Fehler des authoritativen Nameservers"
 
-#: src/core/settings.c:264
+#: src/core/settings.c:314
 #, fuzzy, c-format
 msgid "Couldn't create %s/.irssi directory"
 msgstr ""
 "Datei kann nicht erzeugt werden:\n"
 "%s"
 
-#: src/core/settings.c:268
+#: src/core/settings.c:318
 #, c-format
 msgid ""
 "%s/.irssi is not a directory.\n"
 "You should remove it with command: rm ~/.irssi"
 msgstr ""
 
-#: src/core/settings.c:279
+#: src/core/settings.c:329
 #, c-format
 msgid ""
 "Ignored errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#: src/core/settings.c:306
+#: src/core/settings.c:356
 #, c-format
 msgid ""
 "Errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#. error
-#: src/core/settings.c:331
+#: src/core/settings.c:384
 #, fuzzy, c-format
 msgid "Couldn't save configuration file: %s"
 msgstr ""
 "Datei kann nicht erzeugt werden:\n"
 "%s"
 
-#: src/fe-common/core/printtext.c:944
+#: src/core/settings.c:404
+#, c-format
+msgid ""
+"Configuration file was modified while irssi was running. Saving "
+"configuration to file '%s' instead"
+msgstr ""
+
+#: src/fe-common/core/fe-settings.c:278
+msgid "Overwrite config (y/N)?"
+msgstr ""
+
+#: src/fe-common/core/printtext.c:957
 msgid "%_Warning:%_ %s"
 msgstr "%_Warnung:%_ %s"
 
-#: src/fe-common/core/printtext.c:946
+#: src/fe-common/core/printtext.c:959
 msgid "%_Error:%_ %s"
 msgstr "%_Fehler:%_ %s"
 
@@ -96,40 +106,40 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:89
+#: src/fe-common/irc/fe-common-irc.c:73
 msgid "Automatically connect to server/ircnet"
 msgstr "Automatisch verbinden mit Server/IRCNet"
 
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:73 src/fe-common/irc/fe-common-irc.c:74
 msgid "SERVER"
 msgstr "SERVER"
 
-#: src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:74
 msgid "Autoconnect password"
 msgstr "Autoconnect Passwort"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "Autoconnect port"
 msgstr "Autoconnect Port"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "PORT"
 msgstr "PORT"
 
-#: src/fe-common/irc/fe-common-irc.c:92
+#: src/fe-common/irc/fe-common-irc.c:76
 msgid "Disable autoconnecting"
 msgstr "Autoconnect deaktivieren"
 
-#: src/fe-common/irc/fe-common-irc.c:93
+#: src/fe-common/irc/fe-common-irc.c:77
 msgid "Specify nick to use"
 msgstr "Bitte Nickname angeben"
 
-#: src/fe-common/irc/fe-common-irc.c:94
+#: src/fe-common/irc/fe-common-irc.c:78
 #, fuzzy
 msgid "Specify host name to use"
 msgstr "Bitte Nickname angeben"
 
-#: src/fe-text/irssi.c:164
+#: src/fe-text/irssi.c:165
 msgid "Can't initialize screen handling, quitting.\n"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
deleted file mode 100644
index 6664b0fd..00000000
--- a/po/fi.po
+++ /dev/null
@@ -1,307 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-26 18:28+0300\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: src/core/args.c:55
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#. Display the text when we have already waited
-#. for a while
-#: src/core/net-disconnect.c:144
-msgid "Please wait, waiting for servers to close connections..\n"
-msgstr ""
-
-#: src/core/network.c:480
-msgid "Host not found"
-msgstr ""
-
-#: src/core/network.c:482
-msgid "No IP address found for name"
-msgstr ""
-
-#: src/core/network.c:484
-msgid "A non-recovable name server error occurred"
-msgstr ""
-
-#: src/core/network.c:486
-msgid "A temporary error on an authoritative name server"
-msgstr ""
-
-#: src/core/settings.c:264
-#, c-format
-msgid "Couldn't create %s/.irssi directory"
-msgstr ""
-
-#: src/core/settings.c:268
-#, c-format
-msgid ""
-"%s/.irssi is not a directory.\n"
-"You should remove it with command: rm ~/.irssi"
-msgstr ""
-
-#: src/core/settings.c:279
-#, c-format
-msgid ""
-"Ignored errors in configuration file:\n"
-"%s"
-msgstr ""
-
-#: src/core/settings.c:306
-#, c-format
-msgid ""
-"Errors in configuration file:\n"
-"%s"
-msgstr ""
-
-#. error
-#: src/core/settings.c:331
-#, c-format
-msgid "Couldn't save configuration file: %s"
-msgstr ""
-
-#: src/fe-common/core/printtext.c:944
-msgid "%_Warning:%_ %s"
-msgstr ""
-
-#: src/fe-common/core/printtext.c:946
-msgid "%_Error:%_ %s"
-msgstr ""
-
-#: src/fe-common/core/themes.c:147
-#, c-format
-msgid ""
-"Ignored errors in theme:\n"
-"%s"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:89
-msgid "Automatically connect to server/ircnet"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
-msgid "SERVER"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:90
-msgid "Autoconnect password"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:91
-msgid "Autoconnect port"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:91
-msgid "PORT"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:92
-msgid "Disable autoconnecting"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:93
-msgid "Specify nick to use"
-msgstr ""
-
-#: src/fe-common/irc/fe-common-irc.c:94
-msgid "Specify host name to use"
-msgstr ""
-
-#: src/fe-text/irssi.c:164
-msgid "Can't initialize screen handling, quitting.\n"
-msgstr ""
-
-#: src/lib-popt/popthelp.c:28
-msgid "Show this help message"
-msgstr ""
-
-#: src/lib-popt/popthelp.c:29
-msgid "Display brief usage message"
-msgstr ""
-
-#~ msgid "Channels"
-#~ msgstr "Kanavat"
-
-#~ msgid "Channel"
-#~ msgstr "Kanava"
-
-#~ msgid "Query"
-#~ msgstr "Keskustelu"
-
-#~ msgid "_New"
-#~ msgstr "_Uusi"
-
-#~ msgid "_Save Text As..."
-#~ msgstr "_Tallenna teksti..."
-
-#~ msgid "_Close"
-#~ msgstr "_Sulje"
-
-#~ msgid "_Quit"
-#~ msgstr "_Poistu"
-
-#~ msgid "_Connect..."
-#~ msgstr "_Yhdistä..."
-
-#~ msgid "_Disconnect..."
-#~ msgstr "_Katkaise..."
-
-#~ msgid "C_hannels..."
-#~ msgstr "K_anavat"
-
-#~ msgid "_Status Window..."
-#~ msgstr "_Tilaikkuna..."
-
-#~ msgid "N_otify list..."
-#~ msgstr "_Nikkien tiedotuslista..."
-
-#~ msgid "_Raw Log..."
-#~ msgstr "_Raaka logi..."
-
-#~ msgid "_Links..."
-#~ msgstr "Palvelin_linkit..."
-
-#~ msgid "_Away..."
-#~ msgstr "_Poissa..."
-
-#~ msgid "_Invisible"
-#~ msgstr "Näky_mätön"
-
-#~ msgid "Receive _Wallops"
-#~ msgstr "Vastaanota _wallopeja"
-
-#~ msgid "Receive Server _Notices"
-#~ msgstr "Vastaanota palvelimen _viestejä"
-
-#~ msgid "C_ut"
-#~ msgstr "_Poista"
-
-#~ msgid "_Copy"
-#~ msgstr "_Kopioi"
-
-#~ msgid "_Paste"
-#~ msgstr "_Liitä"
-
-#~ msgid "_Find..."
-#~ msgstr "_Etsi..."
-
-#~ msgid "C_onnections..."
-#~ msgstr "_Yhteydet..."
-
-#~ msgid "_Send File..."
-#~ msgstr "_Lähetä tiedosto..."
-
-#~ msgid "_Chat..."
-#~ msgstr "Avaa _keskustelu..."
-
-#~ msgid "_Server List..."
-#~ msgstr "_Palvelinlista..."
-
-#~ msgid "_Themes..."
-#~ msgstr "_Teemat..."
-
-#~ msgid "_Automation..."
-#~ msgstr "A_utomaatio..."
-
-#~ msgid "_Logging..."
-#~ msgstr "_Lokit..."
-
-#~ msgid "Plu_gins..."
-#~ msgstr "_Pluginit..."
-
-#~ msgid "_Keyboard..."
-#~ msgstr "_Näppäimistö..."
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Asetukset..."
-
-#~ msgid "New _Window"
-#~ msgstr "_Uusi ikkuna"
-
-#~ msgid "_New Tab"
-#~ msgstr "Uusi _kanavaikkuna"
-
-#~ msgid "New _Split Window"
-#~ msgstr "Uusi _jaettu ikkuna"
-
-#~ msgid "Automatically _Raise"
-#~ msgstr "_Nosta ikkuna automaattisesti"
-
-#~ msgid "_Save Size and Position..."
-#~ msgstr "_Tallenna koko ja paikka..."
-
-#~ msgid "Irssi _Website"
-#~ msgstr "_Irssin kotisivu"
-
-#~ msgid "_About..."
-#~ msgstr "_Tietoja..."
-
-#~ msgid "_File"
-#~ msgstr "_Tiedosto"
-
-#~ msgid "_Edit"
-#~ msgstr "_Muokkaa"
-
-#~ msgid "_Server"
-#~ msgstr "_Palvelin"
-
-#~ msgid "Se_ttings"
-#~ msgstr "_Asetukset"
-
-#~ msgid "_Windows"
-#~ msgstr "_Ikkunat"
-
-#~ msgid "_Help"
-#~ msgstr "_Ohje"
-
-#~ msgid "_Leave channel"
-#~ msgstr "_Poistu kanavalta"
-
-#~ msgid "Channel _Modes..."
-#~ msgstr "_Kanavat tilat..."
-
-#~ msgid "Show _Nick List"
-#~ msgstr "_Näytä nikkilista"
-
-#~ msgid "Close _Query"
-#~ msgstr "_Sulje keskustelu"
-
-#~ msgid "_Close DCC chat"
-#~ msgstr "_Sulje DCC keskustelu"
-
-#~ msgid "Find"
-#~ msgstr "Etsi"
-
-#~ msgid "New"
-#~ msgstr "Uusi"
-
-#~ msgid "Close"
-#~ msgstr "Sulje"
-
-#~ msgid "Away reason:"
-#~ msgstr "Syy poissaoloon:"
-
-#~ msgid "(empty)"
-#~ msgstr "(tyhjä)"
-
-#~ msgid "Kick reason:"
-#~ msgstr "Potkun syy:"
-
-#, fuzzy
-#~ msgid "Color# (optional) and Channels"
-#~ msgstr "Kanavat"
diff --git a/po/fr.po b/po/fr.po
index 67cde6fe..f6c07df2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: irssi-0.7.23\n"
-"POT-Creation-Date: 2000-09-26 18:28+0300\n"
+"POT-Creation-Date: 2000-10-19 21:57+0300\n"
 "PO-Revision-Date: 2000-01-26 16:33+0100\n"
 "Last-Translator: Julien Boulnois <jboulnois@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,63 +29,73 @@ msgstr ""
 msgid "Please wait, waiting for servers to close connections..\n"
 msgstr "Veillez patienter, d�éconnexion en cours ...\n"
 
-#: src/core/network.c:480
+#: src/core/network.c:475
 msgid "Host not found"
 msgstr "H�ôte introuvable"
 
-#: src/core/network.c:482
+#: src/core/network.c:477
 msgid "No IP address found for name"
 msgstr "Aucune adresse IP trouv�ée pour ce domaine"
 
-#: src/core/network.c:484
+#: src/core/network.c:479
 msgid "A non-recovable name server error occurred"
 msgstr "Erreur du serveur"
 
-#: src/core/network.c:486
+#: src/core/network.c:481
 msgid "A temporary error on an authoritative name server"
 msgstr "Erreur temporaire sur un nom de serveur autoris�é"
 
-#: src/core/settings.c:264
+#: src/core/settings.c:314
 #, fuzzy, c-format
 msgid "Couldn't create %s/.irssi directory"
 msgstr ""
 "Impossible de cr�éer le fichier:\n"
 "%s"
 
-#: src/core/settings.c:268
+#: src/core/settings.c:318
 #, c-format
 msgid ""
 "%s/.irssi is not a directory.\n"
 "You should remove it with command: rm ~/.irssi"
 msgstr ""
 
-#: src/core/settings.c:279
+#: src/core/settings.c:329
 #, c-format
 msgid ""
 "Ignored errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#: src/core/settings.c:306
+#: src/core/settings.c:356
 #, c-format
 msgid ""
 "Errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#. error
-#: src/core/settings.c:331
+#: src/core/settings.c:384
 #, fuzzy, c-format
 msgid "Couldn't save configuration file: %s"
 msgstr ""
 "Impossible de cr�éer le fichier:\n"
 "%s"
 
-#: src/fe-common/core/printtext.c:944
+#: src/core/settings.c:404
+#, c-format
+msgid ""
+"Configuration file was modified while irssi was running. Saving "
+"configuration to file '%s' instead"
+msgstr ""
+
+#: src/fe-common/core/fe-settings.c:278
+msgid "Overwrite config (y/N)?"
+msgstr ""
+
+#: src/fe-common/core/printtext.c:957
 msgid "%_Warning:%_ %s"
 msgstr "%_Attention:%_ %s"
 
-#: src/fe-common/core/printtext.c:946
+#: src/fe-common/core/printtext.c:959
 msgid "%_Error:%_ %s"
 msgstr "%_Erreur:%_ %s"
 
@@ -96,40 +106,40 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:89
+#: src/fe-common/irc/fe-common-irc.c:73
 msgid "Automatically connect to server/ircnet"
 msgstr "Connexion automatique au server/ircnet"
 
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:73 src/fe-common/irc/fe-common-irc.c:74
 msgid "SERVER"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:74
 msgid "Autoconnect password"
 msgstr "Autoconnexion du Mot de passe"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "Autoconnect port"
 msgstr "Autoconnexion du port"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "PORT"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:92
+#: src/fe-common/irc/fe-common-irc.c:76
 msgid "Disable autoconnecting"
 msgstr "Ne pas se connecter automatiquement"
 
-#: src/fe-common/irc/fe-common-irc.c:93
+#: src/fe-common/irc/fe-common-irc.c:77
 msgid "Specify nick to use"
 msgstr "Sp�écifiez un nick �à utiliser"
 
-#: src/fe-common/irc/fe-common-irc.c:94
+#: src/fe-common/irc/fe-common-irc.c:78
 #, fuzzy
 msgid "Specify host name to use"
 msgstr "Sp�écifiez un nick �à utiliser"
 
-#: src/fe-text/irssi.c:164
+#: src/fe-text/irssi.c:165
 msgid "Can't initialize screen handling, quitting.\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index e64de00f..87cefc3f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-26 18:28+0300\n"
+"POT-Creation-Date: 2000-10-19 21:57+0300\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"
@@ -27,59 +27,69 @@ msgstr ""
 msgid "Please wait, waiting for servers to close connections..\n"
 msgstr "Prosze czekaæ, trwa zamykanie po³±czeñ do serwerów..\n"
 
-#: src/core/network.c:480
+#: src/core/network.c:475
 msgid "Host not found"
 msgstr ""
 
-#: src/core/network.c:482
+#: src/core/network.c:477
 msgid "No IP address found for name"
 msgstr ""
 
-#: src/core/network.c:484
+#: src/core/network.c:479
 msgid "A non-recovable name server error occurred"
 msgstr ""
 
-#: src/core/network.c:486
+#: src/core/network.c:481
 msgid "A temporary error on an authoritative name server"
 msgstr ""
 
-#: src/core/settings.c:264
+#: src/core/settings.c:314
 #, c-format
 msgid "Couldn't create %s/.irssi directory"
 msgstr "Nie mo¿na utworzyæ katalogu %s/.irssi"
 
-#: src/core/settings.c:268
+#: src/core/settings.c:318
 #, c-format
 msgid ""
 "%s/.irssi is not a directory.\n"
 "You should remove it with command: rm ~/.irssi"
 msgstr ""
 
-#: src/core/settings.c:279
+#: src/core/settings.c:329
 #, c-format
 msgid ""
 "Ignored errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#: src/core/settings.c:306
+#: src/core/settings.c:356
 #, c-format
 msgid ""
 "Errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#. error
-#: src/core/settings.c:331
+#: src/core/settings.c:384
 #, c-format
 msgid "Couldn't save configuration file: %s"
 msgstr ""
 
-#: src/fe-common/core/printtext.c:944
+#: src/core/settings.c:404
+#, c-format
+msgid ""
+"Configuration file was modified while irssi was running. Saving "
+"configuration to file '%s' instead"
+msgstr ""
+
+#: src/fe-common/core/fe-settings.c:278
+msgid "Overwrite config (y/N)?"
+msgstr ""
+
+#: src/fe-common/core/printtext.c:957
 msgid "%_Warning:%_ %s"
 msgstr "%_Ostrze¿enie:%_ %s"
 
-#: src/fe-common/core/printtext.c:946
+#: src/fe-common/core/printtext.c:959
 msgid "%_Error:%_ %s"
 msgstr "%_B³±d:%_ %s"
 
@@ -90,39 +100,39 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:89
+#: src/fe-common/irc/fe-common-irc.c:73
 msgid "Automatically connect to server/ircnet"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:73 src/fe-common/irc/fe-common-irc.c:74
 msgid "SERVER"
 msgstr "SERWER"
 
-#: src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:74
 msgid "Autoconnect password"
 msgstr "Has³o autopo³±czenia"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "Autoconnect port"
 msgstr "Port autopo³±czenia"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "PORT"
 msgstr "PORT"
 
-#: src/fe-common/irc/fe-common-irc.c:92
+#: src/fe-common/irc/fe-common-irc.c:76
 msgid "Disable autoconnecting"
 msgstr "Wy³±czenie autopo³±czenia"
 
-#: src/fe-common/irc/fe-common-irc.c:93
+#: src/fe-common/irc/fe-common-irc.c:77
 msgid "Specify nick to use"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:94
+#: src/fe-common/irc/fe-common-irc.c:78
 msgid "Specify host name to use"
 msgstr ""
 
-#: src/fe-text/irssi.c:164
+#: src/fe-text/irssi.c:165
 msgid "Can't initialize screen handling, quitting.\n"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1c9081c5..5e8e4575 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: irssi 0.7.23\n"
-"POT-Creation-Date: 2000-09-26 18:28+0300\n"
+"POT-Creation-Date: 2000-10-19 21:57+0300\n"
 "PO-Revision-Date: 2000-02-10 09:50-0200\n"
 "Last-Translator: Frédéric L. W. Meunier <fredlwm@olympiquedemarseille.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -30,63 +30,73 @@ msgstr ""
 msgid "Please wait, waiting for servers to close connections..\n"
 msgstr "Por favor espere, esperando por servidores fecharem conexões..\n"
 
-#: src/core/network.c:480
+#: src/core/network.c:475
 msgid "Host not found"
 msgstr "Host não encontrado"
 
-#: src/core/network.c:482
+#: src/core/network.c:477
 msgid "No IP address found for name"
 msgstr "Nenhum endereço IP encontrado para nome"
 
-#: src/core/network.c:484
+#: src/core/network.c:479
 msgid "A non-recovable name server error occurred"
 msgstr "Um erro não ??? servidor de nomes ocorreu"
 
-#: src/core/network.c:486
+#: src/core/network.c:481
 msgid "A temporary error on an authoritative name server"
 msgstr "Um erro temporário em um servidor de nomes autoritativo"
 
-#: src/core/settings.c:264
+#: src/core/settings.c:314
 #, fuzzy, c-format
 msgid "Couldn't create %s/.irssi directory"
 msgstr ""
 "Não consigo criar arquivo:\n"
 "%s"
 
-#: src/core/settings.c:268
+#: src/core/settings.c:318
 #, c-format
 msgid ""
 "%s/.irssi is not a directory.\n"
 "You should remove it with command: rm ~/.irssi"
 msgstr ""
 
-#: src/core/settings.c:279
+#: src/core/settings.c:329
 #, c-format
 msgid ""
 "Ignored errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#: src/core/settings.c:306
+#: src/core/settings.c:356
 #, c-format
 msgid ""
 "Errors in configuration file:\n"
 "%s"
 msgstr ""
 
-#. error
-#: src/core/settings.c:331
+#: src/core/settings.c:384
 #, fuzzy, c-format
 msgid "Couldn't save configuration file: %s"
 msgstr ""
 "Não consigo criar arquivo:\n"
 "%s"
 
-#: src/fe-common/core/printtext.c:944
+#: src/core/settings.c:404
+#, c-format
+msgid ""
+"Configuration file was modified while irssi was running. Saving "
+"configuration to file '%s' instead"
+msgstr ""
+
+#: src/fe-common/core/fe-settings.c:278
+msgid "Overwrite config (y/N)?"
+msgstr ""
+
+#: src/fe-common/core/printtext.c:957
 msgid "%_Warning:%_ %s"
 msgstr "%_Atenção:%_ %s"
 
-#: src/fe-common/core/printtext.c:946
+#: src/fe-common/core/printtext.c:959
 msgid "%_Error:%_ %s"
 msgstr "%_Erro:%_ %s"
 
@@ -97,40 +107,40 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/fe-common/irc/fe-common-irc.c:89
+#: src/fe-common/irc/fe-common-irc.c:73
 msgid "Automatically connect to server/ircnet"
 msgstr "Automaticamente conectar em servidor/ircnet"
 
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:73 src/fe-common/irc/fe-common-irc.c:74
 msgid "SERVER"
 msgstr "SERVIDOR"
 
-#: src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:74
 msgid "Autoconnect password"
 msgstr "Senha para autoconecção"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "Autoconnect port"
 msgstr "Porta para autoconecção"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "PORT"
 msgstr "PORTA"
 
-#: src/fe-common/irc/fe-common-irc.c:92
+#: src/fe-common/irc/fe-common-irc.c:76
 msgid "Disable autoconnecting"
 msgstr "Disabilitar autoconecção"
 
-#: src/fe-common/irc/fe-common-irc.c:93
+#: src/fe-common/irc/fe-common-irc.c:77
 msgid "Specify nick to use"
 msgstr "Espeficar nick para usar"
 
-#: src/fe-common/irc/fe-common-irc.c:94
+#: src/fe-common/irc/fe-common-irc.c:78
 #, fuzzy
 msgid "Specify host name to use"
 msgstr "Espeficar nick para usar"
 
-#: src/fe-text/irssi.c:164
+#: src/fe-text/irssi.c:165
 msgid "Can't initialize screen handling, quitting.\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index f2239a38..9881cae6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: irssi 0.7.95\n"
-"POT-Creation-Date: 2000-08-14 01:17+0200\n"
+"POT-Creation-Date: 2000-10-19 21:57+0300\n"
 "PO-Revision-Date: 2000-08-14 01:51+0200\n"
 "Last-Translator: Per von Zweigbergk <pvz@iname.com>\n"
 "Language-Team: Per von Zweigbergh <pvz@iname.com>\n"
@@ -21,7 +21,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Fel vid argument %s: %s.\n"
-"Kör '%s --help' för att se en fullständig lista av tillgängliga kommandoradsväxlar.\n"
+"Kör '%s --help' för att se en fullständig lista av tillgängliga "
+"kommandoradsväxlar.\n"
 
 #. Display the text when we have already waited
 #. for a while
@@ -29,59 +30,75 @@ msgstr ""
 msgid "Please wait, waiting for servers to close connections..\n"
 msgstr "Var god dröj, väntar på att servrarna ska avsluta uppkopplingarna...\n"
 
-#: src/core/network.c:480
+#: src/core/network.c:475
 msgid "Host not found"
 msgstr "Värdnamnet hittades inte"
 
-#: src/core/network.c:482
+#: src/core/network.c:477
 msgid "No IP address found for name"
 msgstr "Ingen IP-address fanns för värdnamnet"
 
-#: src/core/network.c:484
+#: src/core/network.c:479
 msgid "A non-recovable name server error occurred"
 msgstr "Ett allvarligt namnserverfel uppstod"
 
-#: src/core/network.c:486
+#: src/core/network.c:481
 msgid "A temporary error on an authoritative name server"
 msgstr "Ett tillfälligt fel på en autorativ namnserver uppstod"
 
-#: src/core/settings.c:264
+#: src/core/settings.c:314
 #, c-format
 msgid "Couldn't create %s/.irssi directory"
 msgstr "Kunde inte skapa katalogen %s/.irssi"
 
-#: src/core/settings.c:268
+#: src/core/settings.c:318
 #, c-format
 msgid ""
 "%s/.irssi is not a directory.\n"
 "You should remove it with command: rm ~/.irssi"
-msgstr "%s/.irssi är inte en katalog.\nDu borde ta bort den med kommandot: rm ~/.irssi"
+msgstr ""
+"%s/.irssi är inte en katalog.\n"
+"Du borde ta bort den med kommandot: rm ~/.irssi"
 
-#: src/core/settings.c:279
+#: src/core/settings.c:329
 #, c-format
 msgid ""
 "Ignored errors in configuration file:\n"
 "%s"
-msgstr "Ignorerade felaktigheter i konfigurationsfilen:\n%s"
+msgstr ""
+"Ignorerade felaktigheter i konfigurationsfilen:\n"
+"%s"
 
-#: src/core/settings.c:306
+#: src/core/settings.c:356
 #, c-format
 msgid ""
 "Errors in configuration file:\n"
 "%s"
-msgstr "Felaktigheter i konfigurationsfilen:\n%s"
+msgstr ""
+"Felaktigheter i konfigurationsfilen:\n"
+"%s"
 
-#. error
-#: src/core/settings.c:331
+#: src/core/settings.c:384
 #, c-format
 msgid "Couldn't save configuration file: %s"
 msgstr "Kunde inte spara konfigurationen till konfigurationsfilen: %s"
 
-#: src/fe-common/core/printtext.c:944
+#: src/core/settings.c:404
+#, c-format
+msgid ""
+"Configuration file was modified while irssi was running. Saving "
+"configuration to file '%s' instead"
+msgstr ""
+
+#: src/fe-common/core/fe-settings.c:278
+msgid "Overwrite config (y/N)?"
+msgstr ""
+
+#: src/fe-common/core/printtext.c:957
 msgid "%_Warning:%_ %s"
 msgstr "%_Varning:%_ %s"
 
-#: src/fe-common/core/printtext.c:946
+#: src/fe-common/core/printtext.c:959
 msgid "%_Error:%_ %s"
 msgstr "%_Fel:%_ %s"
 
@@ -90,41 +107,43 @@ msgstr "%_Fel:%_ %s"
 msgid ""
 "Ignored errors in theme:\n"
 "%s"
-msgstr "Ignorerade felaktigheter i tema:\n%s"
+msgstr ""
+"Ignorerade felaktigheter i tema:\n"
+"%s"
 
-#: src/fe-common/irc/fe-common-irc.c:89
+#: src/fe-common/irc/fe-common-irc.c:73
 msgid "Automatically connect to server/ircnet"
 msgstr "Koppla automatiskt upp mot server/irc-nätverk"
 
-#: src/fe-common/irc/fe-common-irc.c:89 src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:73 src/fe-common/irc/fe-common-irc.c:74
 msgid "SERVER"
 msgstr "SERVER"
 
-#: src/fe-common/irc/fe-common-irc.c:90
+#: src/fe-common/irc/fe-common-irc.c:74
 msgid "Autoconnect password"
 msgstr "Lösenord för automatisk uppkoppling"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "Autoconnect port"
 msgstr "Portnummer för automatisk uppkoppling"
 
-#: src/fe-common/irc/fe-common-irc.c:91
+#: src/fe-common/irc/fe-common-irc.c:75
 msgid "PORT"
 msgstr "PORT"
 
-#: src/fe-common/irc/fe-common-irc.c:92
+#: src/fe-common/irc/fe-common-irc.c:76
 msgid "Disable autoconnecting"
 msgstr "Avaktivera automatisk uppkoppling"
 
-#: src/fe-common/irc/fe-common-irc.c:93
+#: src/fe-common/irc/fe-common-irc.c:77
 msgid "Specify nick to use"
 msgstr "Välj vilket nicknamn du vill använda"
 
-#: src/fe-common/irc/fe-common-irc.c:94
+#: src/fe-common/irc/fe-common-irc.c:78
 msgid "Specify host name to use"
 msgstr "Välj vilket värdnamn du vill använda"
 
-#: src/fe-text/irssi.c:163
+#: src/fe-text/irssi.c:165
 msgid "Can't initialize screen handling, quitting.\n"
 msgstr "Ett skärmhanteringsinitieringsfel uppstod, avslutar.\n"