13 files changed, 349 insertions, 548 deletions
diff --git a/README b/README
index 0f5b469a..bed8b369 100644
--- a/README
+++ b/README
@@ -3,6 +3,7 @@
 irssi
 
 (ok, this file is out of date, there is no gtk version currently)
+(read docs/startup-HOWTO.txt - it will help you get started)
 
 
  * ABOUT
@@ -16,9 +17,7 @@ also like to see KDE version.
  * FEATURES
 
 docs/manual.txt - new manual
-
-See docs/commands.txt file for list of (almost) all commands irssi knows.
-See docs/perl.txt for some documentation of Perl scripting.
+docs/perl.txt - some documentation of Perl scripting
 
 I've been asked quite a lot about why should one use irssi, what does it do
 that other IRC clients don't? Well, to tell you the truth, I have no idea :)
diff --git a/TODO b/TODO
index 7451c201..f3288930 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 
 *** New stuff in TODO, try to get rid of these :)
 
+( - translate all those TODO items I have in finnish to english ;) )
  - /ignore -activity .. would ignore it just in window activity list,
    not hide the text.
  - autoignoring:
@@ -159,6 +160,7 @@
      - if some other window has got much text, switching to it first time
        takes some time..?
  - editor in setup for ~/.irssi/startup
+ - dcc floods could pop up lots of dialogs..
  - gui help
  - change signal handling in gui-gnome so that the actual drawing and
    functionality are in different signals, so that plugin could change the
diff --git a/configure.in b/configure.in
index 24580404..e20e00ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(irssi, 0.7.95)
+AM_INIT_AUTOMAKE(irssi, 0.7.96)
 
 AM_MAINTAINER_MODE
 
@@ -440,7 +440,7 @@ dnl **
 dnl ** internationalization support
 dnl **
 
-ALL_LINGUAS="pl fi pt_BR fr de sv"
+ALL_LINGUAS="pl pt_BR fr de sv"
 AM_GNU_GETTEXT
 
 if test "x$MSGFMT" = "xno"; then
diff --git a/docs/manual.txt b/docs/manual.txt
index 0c67af21..df6ccfe5 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -202,7 +202,8 @@
 	WALLOPS         - Wallop is received
 	INVITES         - Invite is received
 	NICKS           - Someone changes nick
-	DCC             - DCC messages
+	DCC             - DCC related messages
+        DCCMSGS		- DCC chat messages
 	CLIENTNOTICES   - Irssi's notices
 	CLIENTERRORS    - Irssi's error messages
 	CLIENTCRAP      - Some other messages from Irssi
diff --git a/docs/perl.txt b/docs/perl.txt
index 8183dc65..4ebbdaed 100644
--- a/docs/perl.txt
+++ b/docs/perl.txt
@@ -2,6 +2,8 @@
  --------------------
 
 FIXME: part of this file is out of date..
+UPDATE: 0.7.96 - this is even yet more out of date ;) See scripts in
+samples/ directory, they'll help you get started :)
 
 Place new scripts to ~/.irssi/scripts/, or /usr/lib/irssi/scripts/
 directory and run then with /RUN script. Or you could also run the
diff --git a/docs/signals.txt b/docs/signals.txt
index c2b9a6d0..39810032 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -1,55 +1,107 @@
 List of signals irssi emits - see design.txt for more information about
 signals.
 
-IRC base
---------
+core
+----
 
 * Requires to work properly:
 
  "gui exit"
+ "gui dialog", char *type, char *text
  "send command", char *command, SERVER_REC, WI_ITEM_REC
+ "print text stripped", WINDOW_REC, SERVER_REC, char *channel, int level, char *text
 
 * Provides signals:
 
-irc.c:
+channels.c:
+ "channel created", CHANNEL_REC, int automatic
+ "channel destroyed", CHANNEL_REC
+
+chatnets.c:
+ "chatnet created", CHATNET_REC
+ "chatnet destroyed", CHATNET_REC
+
+commands.c:
+ "commandlist new", COMMAND_REC
+ "commandlist remove", COMMAND_REC
+ "error command", int err, char *cmd
 
- "send command", char *args, SERVER_REC
+ "send command", char *args, SERVER_REC, WI_ITEM_REC
+ "send text", char *line, SERVER_REC, WI_ITEM_REC
  "command "<cmd>, char *args, SERVER_REC, WI_ITEM_REC
  "default command", char *args, SERVER_REC, WI_ITEM_REC
 
- "server event", char *data, SERVER_REC, char *sender_nick, char *sender_address
- "event "<cmd>, char *args, SERVER_REC, char *sender_nick, char *sender_address
- "default event", char *data, SERVER_REC, char *sender_nick, char *sender_address
+ignore.c:
+ "ignore created", IGNORE_REC
+ "ignore destroyed", IGNORE_REC
+ "ignore changed", IGNORE_REC
 
- "server incoming", SERVER_REC, char *data
+log.c:
+ "log new", LOG_REC
+ "log remove", LOG_REC
+ "log create failed", LOG_REC
+ "log locked", LOG_REC
+ "log started", LOG_REC
+ "log stopped", LOG_REC
+ "log written", LOG_REC, char *line
 
-(for perl parser..)
- "redir "<cmd>, char *args, SERVER_REC, char *sender_nick, char *sender_address
+modules.c:
+ "module loaded", MODULE_REC
+ "module unloaded", MODULE_REC
+ "module error", int error, char *module, char *text
 
-bans.c:
+nicklist.c:
+ "nicklist new", CHANNEL_REC, NICK_REC
+ "nicklist remove", CHANNEL_REC, NICK_REC
+ "nicklist changed", CHANNEL_REC, NICK_REC, char *orignick
+ "nick gone changed", CHANNEL_REC, NICK_REC
+ "nick serverop changed", CHANNEL_REC, NICK_REC
 
- "ban new", BAN_REC
- "ban remove", BAN_REC
- "ban exception new", BAN_REC
- "ban exception remove", BAN_REC
- "ban type changed", char *bantype
+pidwait.c:
+ "pidwait", int pid
 
-commands.c:
- "commandlist new", COMMAND_REC
- "commandlist remove", COMMAND_REC
+queries.c:
+ "query created", QUERY_REC, int automatic
+ "query destroyed", QUERY_REC
+ "query nick changed", QUERY_REC
+ "query address changed", QUERY_REC
+ "query server changed", QUERY_REC, SERVER_REC
 
-channels.c:
+rawlog.c:
+ "rawlog", RAWLOG_REC, char *data
 
- "channel created", CHANNEL_REC
- "channel destroyed", CHANNEL_REC
- "channel name changed", CHANNEL_REC
- "channel topic changed", CHANNEL_REC
- "channel server changed", CHANNEL_REC, SERVER_REC *oldserver
+server.c:
+ "server looking", SERVER_REC
+ "server connected", SERVER_REC
+ "server connecting", SERVER_REC, ulong *ip
+ "server connect failed", SERVER_REC
+ "server disconnected", SERVER_REC
+ "server quit", SERVER_REC, char *msg
+
+settings.c:
+ "setup changed"
+ "setup reread"
+
+signal.c:
+
+ "signal", char *name, ...
+ "last signal", char *name, ...
 
- "channel query", CHANNEL_REC
+IRC core
+--------
+
+* Provides signals:
+
+bans.c:
+ "ban type changed", char *bantype
+
+channels, nicklist:
+ "channel joined", CHANNEL_REC
  "channel wholist", CHANNEL_REC
  "channel sync", CHANNEL_REC
 
+ "channel topic changed", CHANNEL_REC
+
 ctcp.c:
 
  "ctcp msg "<cmd>, char *args, SERVER_REC, char *nick, char *addr, char *target
@@ -57,71 +109,59 @@ ctcp.c:
  "ctcp reply "<cmd>, char *args, SERVER_REC, char *nick, char *addr, char *target
  "default ctcp reply", char *args, SERVER_REC, char *nick, char *addr, char *target
 
-lag.c:
+irc-log.c:
+ "awaylog show", LOG_REC, int away_msgs, int filepos
+
+irc-nicklist.c:
+ "server nick changed", SERVER_REC
+
+irc-servers.c:
+ "event connected", SERVER_REC
+
+irc.c:
+
+ "server event", char *data, SERVER_REC, char *sender_nick, char *sender_address
+ "event "<cmd>, char *args, SERVER_REC, char *sender_nick, char *sender_address
+ "default event", char *data, SERVER_REC, char *sender_nick, char *sender_address
+
+ "server incoming", SERVER_REC, char *data
 
+(for perl parser..)
+ "redir "<cmd>, char *args, SERVER_REC, char *sender_nick, char *sender_address
+
+lag.c:
  "server lag", SERVER_REC
  "server lag disconnect", SERVER_REC
- "lag", char *server, int lag
 
-modes.c:
+massjoin.c:
+ "massjoin", CHANNEL_REC, GSList of NICK_RECs
 
+mode-lists.c:
+ "ban new", BAN_REC
+ "ban remove", BAN_REC
+ "ban exception new", BAN_REC
+ "ban exception remove", BAN_REC
  "invitelist new", CHANNEL_REC, char *mask
  "invitelist remove", CHANNEL_REC, char *mask
 
+modes.c:
  "channel mode changed", CHANNEL_REC
- "user mode changed", SERVER_REC
  "nick mode changed", CHANNEL_REC, NICK_REC
+ "user mode changed", SERVER_REC, char *old
+ "away mode changed", SERVER_REC
 
 netsplit.c:
-
+ "netsplit server new", SERVER_REC, NETSPLIT_SERVER_REC
+ "netsplit server remove", SERVER_REC, NETSPLIT_SERVER_REC
  "netsplit add", NETSPLIT_REC
  "netsplit remove", NETSPLIT_REC
 
-nicklist.c:
-
- "nicklist new", CHANNEL_REC, NICK_REC
- "nicklist remove", CHANNEL_REC, NICK_REC
- "nicklist changed", CHANNEL_REC, NICK_REC, char *oldnick
- "nick gone changed", CHANNEL_REC, NICK_REC
- "nick ircop changed", CHANNEL_REC, NICK_REC
- "server nick changed", SERVER_REC
- "massjoin", CHANNEL_REC, GSList of NICK_RECs
-
-rawlog.c:
-
- "rawlog", SERVER_REC, char *data
-
-server.c:
-
- "server connect failed", SERVER_REC
- "server connected", SERVER_REC
- "server connecting", SERVER_REC, ulong *ip
- "server looking", SERVER_REC
- "server disconnected", SERVER_REC
- "server quit", SERVER_REC, char *msg
- "event connected", SERVER_REC
-
-server-reconnect.c:
-
- "server reconnect new", RECONNECT_REC
- "server reconnect remove", RECONNECT_REC
- "server reconnect not found", char *tag
-
-signal.c:
-
- "signal", char *name, ...
- "last signal", char *name, ...
-
-IRC extra
----------
-
-* Requires to work properly:
-
- "print text stripped", SERVER_REC, char *channel, int level, char *text
+IRC modules
+-----------
 
 * Provides signals:
 
-dcc.c:
+dcc*.c:
 
  "dcc ctcp "<cmd>, char *args, DCC_REC
  "default dcc ctcp", char *args, DCC_REC
@@ -138,9 +178,9 @@ dcc.c:
  "dcc connected", DCC_REC
  "dcc rejecting", DCC_REC
  "dcc closed", DCC_REC
+ "dcc request", DCC_REC
  "dcc chat message", DCC_REC, char *msg
  "dcc transfer update", DCC_REC
- "dcc request", DCC_REC
  "dcc get receive", DCC_REC
  "dcc error connect", DCC_REC
  "dcc error file create", DCC_REC, char *filename
@@ -150,24 +190,14 @@ dcc.c:
  "dcc error unknown type", char *type
  "dcc error close not found", char *type, char *nick, char *filename
 
-flood.c:
-
- "flood", SERVER_REC, char *nick, char *host, int level, char *target
-
-ignore.c:
+autoignore.c:
 
  "autoignore new", SERVER_REC, AUTOIGNORE_REC
  "autoignore remove", SERVER_REC, AUTOIGNORE_REC
 
-log.c:
+flood.c:
 
- "log new", LOG_REC
- "log remove", LOG_REC
- "log open failed", LOG_REC
- "log locked", LOG_REC
- "log started", LOG_REC
- "log stopped", LOG_REC
- "log written", LOG_REC, char *line
+ "flood", SERVER_REC, char *nick, char *host, int level, char *target
 
 notifylist.c:
 
@@ -178,36 +208,65 @@ notifylist.c:
  "notifylist unidle", SERVER_REC, char *nick, char *user, char *host, char *realname, char *awaymsg
  "notifylist left", SERVER_REC, char *nick, char *user, char *host, char *realname, char *awaymsg
 
-UI common
+FE common
 ---------
 
 * Requires to work properly:
 
- "gui print text", CHANNEL_REC, int fg, int bg, int flags, char *text
+ "gui print text", WINDOW_REC, int fg, int bg, int flags, char *text, int level
  "gui window goto", int number
 
-* Can be used to determine when all "gui print text"s are sent (not required)
-
- "print text finished", CHANNEL_REC
+(Can be used to determine when all "gui print text"s are sent (not required))
+ "print text finished", WINDOW_REC
 
 * Provides signals:
 
-ui-keyboard.c:
-
+fe-common-core.c:
+ "irssi init read settings"
+
+fe-messages.c:
+ "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
+ "message private", SERVER_REC, char *msg, char *nick, char *address
+ "message join", SERVER_REC, char *channel, char *nick, char *address
+ "message part", SERVER_REC, char *channel, char *nick, char *address, char *reason
+ "message quit", SERVER_REC, char *nick, char *address, char *reason
+ "message kick", SERVER_REC, char *channel, char *nick, char *kicker, char *address, char *reason
+ "message nick", SERVER_REC, char *newnick, char *oldnick, char *address
+ "message own_nick", SERVER_REC, char *newnick, char *oldnick, char *address
+ "message invite", SERVER_REC, char *channel, char *nick, char *address
+ "message topic", SERVER_REC, char *channel, char *topic, char *nick, char *address
+
+hilight-text.c:
+ "window hilight", WINDOW_REC, int level
+ "window activity", WINDOW_REC, int level
+
+keyboard.c:
  "keyinfo created", KEYINFO_REC
  "keyinfo destroyed", KEYINFO_REC
 
-ui-printtext.c:
-
- "print text", SERVER_REC, char *channel, int level, char *text
- "print text stripped", SERVER_REC, char *channel, int level, char *text
-
-ui-themes.c:
+printtext.c:
+ "print text", WINDOW_REC, SERVER_REC, char *channel, int level, char *text
+ "print text stripped", WINDOW_REC, SERVER_REC, char *channel, int level, char *text
 
+themes.c:
  "theme created", THEME_REC
  "theme destroyed", THEME_REC
 
-ui-windows.c:
+window-activity.c:
+ "window item hilight", WI_ITEM_REC
+
+window-items.c:
+ "window item new", WINDOW_REC, WI_ITEM_REC
+ "window item remove", WINDOW_REC, WI_ITEM_REC
+ "window item changed", WINDOW_REC, WI_ITEM_REC
+ "window item server changed", WINDOW_REC, WI_ITEM_REC
 
+windows.c:
  "window created", WINDOW_REC
  "window destroyed", WINDOW_REC
+ "window changed", WINDOW_REC, WINDOW_REC old
+ "window changed automatic", WINDOW_REC
+ "window server changed", WINDOW_REC, SERVER_REC
+ "window refnum changed", WINDOW_REC, int old
+ "window name changed", WINDOW_REC
+ "window level changed", WINDOW_REC
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"
 
diff --git a/servertest/server.c b/servertest/server.c
index 677e6b32..af3e4148 100644
--- a/servertest/server.c
+++ b/servertest/server.c
@@ -87,6 +87,7 @@ gint read_line(gboolean socket, gint handle, GString *output, GString *buffer)
 }
 void client_send(char *text)
 {
+    if (strlen(text) > 508) text[508] = 0;
     write(clienth, text, strlen(text));
     write(clienth, "\r\n", 2);
 }
@@ -99,12 +100,12 @@ void makerand(char *str, int len)
 
 void makerand2(char *str, int len)
 {
-#if 0
+#if 1
     gchar c;
 
     while (len > 0)
     {
-	c = rand() & 255;
+	c = (rand() % 20)+ 'A';
 	if (c != 0 && c != 13 && c != 10)
 	{
 	    *str++ = c;
@@ -229,7 +230,7 @@ void send_cmd(void)
                 {
                     pos += sprintf(str+pos, "%s: ", clientnick);
 		}
-                str[pos] = 'X';
+		str[pos] = 'X';
 		break;
         }
 
@@ -352,25 +353,10 @@ int main(void)
     static fd_set fdset;
     struct timeval tv;
     int serverh, port;
-    IPADDR ip;
-
-#ifdef HAVE_IPV6
-    if (net_gethostname("::1", &ip) != 0)
-    {
-	printf("net_gethostname()\n");
-	return 1;
-    }
-#else
-    if (net_gethostname("127.0.0.1", &ip) != 0)
-    {
-	printf("net_gethostname()\n");
-	return 1;
-    }
-#endif
 
     srand(0);
     port = 6660;
-    serverh = net_listen(&ip, &port);
+    serverh = net_listen(NULL, &port);
     if (serverh == -1)
     {
 	printf("listen()\n");